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 98C32C433FE for ; Wed, 6 Oct 2021 21:22:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1492561130 for ; Wed, 6 Oct 2021 21:22:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1492561130 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 25B33900002; Wed, 6 Oct 2021 17:22:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20AFC6B0071; Wed, 6 Oct 2021 17:22:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FA3B900002; Wed, 6 Oct 2021 17:22:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0126.hostedemail.com [216.40.44.126]) by kanga.kvack.org (Postfix) with ESMTP id F120C6B006C for ; Wed, 6 Oct 2021 17:22:10 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 9459B183E6C90 for ; Wed, 6 Oct 2021 21:22:10 +0000 (UTC) X-FDA: 78667285620.12.DB56B99 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf08.hostedemail.com (Postfix) with ESMTP id 4461F3001FD5 for ; Wed, 6 Oct 2021 21:22:10 +0000 (UTC) Received: from gandalf.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 D757861040; Wed, 6 Oct 2021 21:22:08 +0000 (UTC) Date: Wed, 6 Oct 2021 17:22:07 -0400 From: Steven Rostedt To: Randy Dunlap Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , linux-mm@kvack.org, Andrew Morton Subject: Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate) Message-ID: <20211006172207.11982951@gandalf.local.home> In-Reply-To: References: <20211005190628.1f26b13d@canb.auug.org.au> 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 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 4461F3001FD5 X-Stat-Signature: rbaeceb365s75gniu9fmfm7axw5msxp3 Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf08.hostedemail.com: domain of "SRS0=wi3F=O2=goodmis.org=rostedt@kernel.org" designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=wi3F=O2=goodmis.org=rostedt@kernel.org" X-HE-Tag: 1633555330-248060 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 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