From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EB8EC433F5 for ; Thu, 7 Oct 2021 01:10:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 407226112D for ; Thu, 7 Oct 2021 01:10:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232261AbhJGBL4 (ORCPT ); Wed, 6 Oct 2021 21:11:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:41388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbhJGBLy (ORCPT ); Wed, 6 Oct 2021 21:11:54 -0400 Received: from rorschach.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F45C610FC; Thu, 7 Oct 2021 01:10:01 +0000 (UTC) Date: Wed, 6 Oct 2021 21:10:00 -0400 From: Steven Rostedt To: Randy Dunlap Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , linux-mm@kvack.org, Andrew Morton , Jackie Liu Subject: Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate) Message-ID: <20211006211000.16b2284b@rorschach.local.home> In-Reply-To: <6d8f22a1-5f54-aa2a-7628-1d98a7f0fb95@infradead.org> References: <20211005190628.1f26b13d@canb.auug.org.au> <20211006172207.11982951@gandalf.local.home> <6d8f22a1-5f54-aa2a-7628-1d98a7f0fb95@infradead.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 6 Oct 2021 14:32:21 -0700 Randy Dunlap wrote: > On 10/6/21 2:22 PM, Steven Rostedt wrote: > > On Tue, 5 Oct 2021 13:46:52 -0700 > > Randy Dunlap wrote: > > > >> a. randconfig: KCONFIG_SEED=0xBFBEA13C > >> ../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function] > >> static void trace_create_maxlat_file(struct trace_array *tr, > > > > Does this fix it? > > > > -- Steve > > Yes, thanks. > > Acked-by: Randy Dunlap # build-tested Plumbers followed by Open Source Summit totally blew my brain cache. I have a fix for this in my queue from Jackie Liu that I haven't processed yet (just going through my queue now when I noticed it). Can you test this patch instead? https://lore.kernel.org/r/20210922025122.3268022-1-liu.yun@linux.dev Thanks! -- Steve > > > > > > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > > index 7896d30d90f7..4520cbab0da5 100644 > > --- a/kernel/trace/trace.c > > +++ b/kernel/trace/trace.c > > @@ -1744,16 +1744,15 @@ void latency_fsnotify(struct trace_array *tr) > > irq_work_queue(&tr->fsnotify_irqwork); > > } > > > > -/* > > - * (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)) && \ > > - * defined(CONFIG_FSNOTIFY) > > - */ > > -#else > > +/* CONFIG_FSNOTIFY else */ > > +#elif CREATE_MAX_TRACE_FILE > > > > #define trace_create_maxlat_file(tr, d_tracer) \ > > trace_create_file("tracing_max_latency", 0644, d_tracer, \ > > &tr->max_latency, &tracing_max_lat_fops) > > > > +#else > > +#define trace_create_maxlat_file(tr, d_tracer) do { } while (0) > > #endif > > > > #ifdef CONFIG_TRACER_MAX_TRACE > > @@ -9473,9 +9472,7 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer) > > > > create_trace_options_dir(tr); > > > > -#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) > > trace_create_maxlat_file(tr, d_tracer); > > -#endif > > > > if (ftrace_create_function_files(tr, d_tracer)) > > MEM_FAIL(1, "Could not allocate function filter files"); > > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > > index b7c0f8e160fb..680935949aef 100644 > > --- a/kernel/trace/trace.h > > +++ b/kernel/trace/trace.h > > @@ -679,8 +679,11 @@ void update_max_tr_single(struct trace_array *tr, > > #endif /* CONFIG_TRACER_MAX_TRACE */ > > > > #if (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) \ > > - || defined(CONFIG_OSNOISE_TRACER)) && defined(CONFIG_FSNOTIFY) > > -#define LATENCY_FS_NOTIFY > > + || defined(CONFIG_OSNOISE_TRACER)) > > +# define CREATE_MAX_TRACE_FILE > > +# ifdef CONFIG_FSNOTIFY > > +# define LATENCY_FS_NOTIFY > > +# endif > > #endif > > > > #ifdef LATENCY_FS_NOTIFY > > > >