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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 E0424C47096 for ; Mon, 31 May 2021 03:36:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 758AC61222 for ; Mon, 31 May 2021 03:36:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 758AC61222 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EA84B6B006E; Sun, 30 May 2021 23:36:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E7F9A6B0070; Sun, 30 May 2021 23:36:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D47728D0002; Sun, 30 May 2021 23:36:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id A5EB76B006E for ; Sun, 30 May 2021 23:36:03 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 47F053A92 for ; Mon, 31 May 2021 03:36:03 +0000 (UTC) X-FDA: 78200112606.05.A0032BA Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf18.hostedemail.com (Postfix) with ESMTP id 44DF72001095 for ; Mon, 31 May 2021 03:35:52 +0000 (UTC) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Ftgq36wDGz68yZ; Mon, 31 May 2021 11:33:03 +0800 (CST) Received: from dggpemm500004.china.huawei.com (7.185.36.219) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 31 May 2021 11:35:29 +0800 Received: from huawei.com (10.174.28.241) by dggpemm500004.china.huawei.com (7.185.36.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 31 May 2021 11:35:28 +0800 From: Bixuan Cui To: CC: , , , Bixuan Cui Subject: [PATCH -next v2] mm/mmap_lock: fix warning when CONFIG_TRACING is not defined Date: Mon, 31 May 2021 11:34:26 +0800 Message-ID: <20210531033426.74031-1-cuibixuan@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset="y" X-Originating-IP: [10.174.28.241] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500004.china.huawei.com (7.185.36.219) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 44DF72001095 Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of cuibixuan@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=cuibixuan@huawei.com; dmarc=pass (policy=none) header.from=huawei.com X-Rspamd-Server: rspam03 X-Stat-Signature: f7qqq5g5durnqt9zqamf71pidfpyfjum X-HE-Tag: 1622432152-705421 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: Fix the warning: [-Wunused-function] mm/mmap_lock.c:157:20: warning: =E2=80=98get_mm_memcg_path=E2=80=99 defin= ed but not used static const char *get_mm_memcg_path(struct mm_struct *mm) ^~~~~~~~~~~~~~~~~ Move get_mm_memcg_path() into #ifdef CONFIG_TRACING. Signed-off-by: Bixuan Cui Acked-by: Matthew Wilcox (Oracle) --- Changes in v2: Move get_mm_memcg_path() into #ifdef CONFIG_TRACING to fix the warning. mm/mmap_lock.c | 60 ++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 29 deletions(-) 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 return= a * pointer to it. If the path cannot be determined, or no buffer was ava= ilable @@ -175,37 +206,8 @@ static const char *get_mm_memcg_path(struct mm_struc= t *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 circul= ar * dependency between linux/mmap_lock.h and trace/events/mmap_lock.h. --=20 2.17.1