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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 637FBC47083 for ; Mon, 31 May 2021 22:02:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DB8F46128A for ; Mon, 31 May 2021 22:02:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB8F46128A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6E5028D0001; Mon, 31 May 2021 18:02:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 695066B006C; Mon, 31 May 2021 18:02:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55CD38D0001; Mon, 31 May 2021 18:02:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0174.hostedemail.com [216.40.44.174]) by kanga.kvack.org (Postfix) with ESMTP id 229046B0036 for ; Mon, 31 May 2021 18:02:35 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id BF357180AD807 for ; Mon, 31 May 2021 22:02:34 +0000 (UTC) X-FDA: 78202901028.07.C17D18F Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf21.hostedemail.com (Postfix) with ESMTP id EBB1EE000263 for ; Mon, 31 May 2021 22:02:18 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id B6400610E7; Mon, 31 May 2021 22:02:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1622498551; bh=5ro2yd7/l1B26WTmAhjAsxZqQV6JJ76rUjTohSCFwiw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=cvdQJ8ksHOiV0MC7lG4BzkGwz6r/Qt/CJ/QvMJnimlDCH0Y/QIxQfiTxOKJHJRE0z R9Z8YKioc1/3UC6ibdrErMbni4ybzQ4hSt6bp4nXJHv7cAod3xcIkH1UNbIrAOEn55 VBy+hj917Gr7taSapmYi1E4Pqgb3aw7QV5UXktL4= Date: Mon, 31 May 2021 15:02:31 -0700 From: Andrew Morton To: Bixuan Cui Cc: , , , Mel Gorman Subject: Re: [PATCH -next v2] mm/mmap_lock: fix warning when CONFIG_TRACING is not defined Message-Id: <20210531150231.2e7bfdb063db06dfdfb81a26@linux-foundation.org> In-Reply-To: <20210531033426.74031-1-cuibixuan@huawei.com> References: <20210531033426.74031-1-cuibixuan@huawei.com> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=cvdQJ8ks; dmarc=none; spf=pass (imf21.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Stat-Signature: xp9xdyyzcfi4cc83me94dgn3kg6ysiuo X-Rspamd-Queue-Id: EBB1EE000263 X-Rspamd-Server: rspam02 X-HE-Tag: 1622498538-785576 Content-Transfer-Encoding: quoted-printable 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 Mon, 31 May 2021 11:34:26 +0800 Bixuan Cui wrot= e: > Fix the warning: [-Wunused-function] > mm/mmap_lock.c:157:20: warning: =E2=80=98get_mm_memcg_path=E2=80=99 def= ined but not used > static const char *get_mm_memcg_path(struct mm_struct *mm) > ^~~~~~~~~~~~~~~~~ >=20 > Move get_mm_memcg_path() into #ifdef CONFIG_TRACING. Thanks, I queued this as a fix against Mel's "mm/mmap_lock: remove dead code for !CONFIG_TRACING configurations". > mm/mmap_lock.c | 60 ++++++++++++++++++++++++++------------------------ > 1 file changed, 31 insertions(+), 29 deletions(-) >=20 > diff --git a/mm/mmap_lock.c b/mm/mmap_lock.c > index 03ee85c696ef..29e99af73144 100644 > --- a/mm/mmap_lock.c > +++ b/mm/mmap_lock.c > @@ -142,6 +142,37 @@ static inline void put_memcg_path_buf(void) > rcu_read_unlock(); > } > =20 > +#define TRACE_MMAP_LOCK_EVENT(type, mm, ...) = \ > + do { = \ > + const char *memcg_path; \ > + preempt_disable(); \ > + memcg_path =3D get_mm_memcg_path(mm); \ > + trace_mmap_lock_##type(mm, \ > + memcg_path !=3D NULL ? memcg_path : "", \ > + ##__VA_ARGS__); \ > + if (likely(memcg_path !=3D NULL)) \ > + put_memcg_path_buf(); \ > + preempt_enable(); \ > + } while (0) > + > +#else /* !CONFIG_MEMCG */ > + > +int trace_mmap_lock_reg(void) > +{ > + return 0; > +} > + > +void trace_mmap_lock_unreg(void) > +{ > +} > + > +#define TRACE_MMAP_LOCK_EVENT(type, mm, ...) = \ > + trace_mmap_lock_##type(mm, "", ##__VA_ARGS__) > + > +#endif /* CONFIG_MEMCG */ > + > +#ifdef CONFIG_TRACING > +#ifdef CONFIG_MEMCG > /* > * Write the given mm_struct's memcg path to a percpu buffer, and retu= rn a > * pointer to it. If the path cannot be determined, or no buffer was a= vailable > @@ -175,37 +206,8 @@ static const char *get_mm_memcg_path(struct mm_str= uct *mm) > out: > return buf; > } > - > -#define TRACE_MMAP_LOCK_EVENT(type, mm, ...) = \ > - do { = \ > - const char *memcg_path; \ > - preempt_disable(); \ > - memcg_path =3D get_mm_memcg_path(mm); \ > - trace_mmap_lock_##type(mm, \ > - memcg_path !=3D NULL ? memcg_path : "", \ > - ##__VA_ARGS__); \ > - if (likely(memcg_path !=3D NULL)) \ > - put_memcg_path_buf(); \ > - preempt_enable(); \ > - } while (0) > - > -#else /* !CONFIG_MEMCG */ > - > -int trace_mmap_lock_reg(void) > -{ > - return 0; > -} > - > -void trace_mmap_lock_unreg(void) > -{ > -} > - > -#define TRACE_MMAP_LOCK_EVENT(type, mm, ...) = \ > - trace_mmap_lock_##type(mm, "", ##__VA_ARGS__) > - > #endif /* CONFIG_MEMCG */ > =20 > -#ifdef CONFIG_TRACING > /* > * Trace calls must be in a separate file, as otherwise there's a circ= ular > * dependency between linux/mmap_lock.h and trace/events/mmap_lock.h. > --=20 > 2.17.1