From patchwork Thu May 28 09:56:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11575455 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD1A292A for ; Thu, 28 May 2020 09:56:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7F3FB206B6 for ; Thu, 28 May 2020 09:56:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F3FB206B6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id ABF428001A; Thu, 28 May 2020 05:56:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A48C980010; Thu, 28 May 2020 05:56:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 910908001A; Thu, 28 May 2020 05:56:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0234.hostedemail.com [216.40.44.234]) by kanga.kvack.org (Postfix) with ESMTP id 76B6A80010 for ; Thu, 28 May 2020 05:56:56 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2BA25181AEF15 for ; Thu, 28 May 2020 09:56:56 +0000 (UTC) X-FDA: 76865674032.24.plant18_76ab6582cfd41 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 0C4AA1A4A7 for ; Thu, 28 May 2020 09:56:56 +0000 (UTC) X-Spam-Summary: 2,0,0,288436e41fcca488,d41d8cd98f00b204,arnd@arndb.de,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1431:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3870:3876:4250:4321:5007:6261:6742:10004:11026:11473:11658:11914:12048:12160:12296:12297:12555:12679:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:21660:21990:30054,0,RBL:212.227.126.133:@arndb.de:.lbl8.mailshell.net-62.14.6.100 66.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: plant18_76ab6582cfd41 X-Filterd-Recvd-Size: 3738 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.133]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 May 2020 09:56:55 +0000 (UTC) Received: from threadripper.lan ([149.172.98.151]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MPGJh-1jNYOn19Pp-00Pco1; Thu, 28 May 2020 11:56:44 +0200 From: Arnd Bergmann To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Stephen Rothwell , Joonsoo Kim Cc: Arnd Bergmann , Alex Shi , Hugh Dickins , "Kirill A. Shutemov" , Michal Hocko , Roman Gushchin , Shakeel Butt , Balbir Singh , Chris Down , Yafang Shao , Tejun Heo , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: memcontrol: fix an unused-function warning Date: Thu, 28 May 2020 11:56:26 +0200 Message-Id: <20200528095640.151454-1-arnd@arndb.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:MmnweMcrIlQS31C4Eojn+fisoHH6xccQrSm5HEQ7Cg4yek9PYGC +ghSiDQyJqsxnlMJfWbmBK2Qu6dq6unBLwpvZ0yHILOPW/ria1qeOlXncbIGyYc5lvWAzZ1 7GmpBcr+r0Cnb3BVV8dej8SDqtMZZYqtv6KdgWZ0SpUaVNyg1GdFQXpiM62/hST9SV3t5jh PRjOjacy/S1rObEnr+NBA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Tt63NLnuUFg=:a9faJh4it/EFiD6fj/M/gH t2D0WyESVdFmjjor8z9UwmI7Q+RS2KcFEZzAL6ThJP0jbq1dtr08eDCfcLfoZewsKiENs5HGs f904rkJoqqc9tDLq2ebhaa2vyAdXxJXL7AwR7Yn7niUqSGwg+BGvh41903eG5wyEPK1QjfjEl t7SnlC3ZXpH6Ce/fcLrYSgu5JNSt3BBttO6XHI7hluh6+4gKyezMJ1F7TtALflb7k+6bCGqah hyy/XZSz50UeCny1mM63SE/grrMlyggkSWzQGqRQQQ5C/noZKGnZTojlSKKDMe1Kx46OlLxgf aR1QJvSnQG9yM2zdoYpb0qGCZXHzz6k9rwD7FNu0Ydnd5eLbCXuD3H/T6zn5/zYtpsYRq7osQ IRvYYuSrabVOdOSk7VyKYn4B7+Jyktf0mWo3AwmByDaUiLDM23iUWYD06tk1d25TbsEuYG0G4 daI/VBZTJLAEHYMR5JDkVI20cq5LX26WTN8RWnq3eFcobjBn7+wUhO88U0bkc5vQGvgf+tcNV TcZQoQ50WncZArEdeBiE7+Ukn1NgRl/Z5WRuHphG9OZtAbHl9YNOyGxWauVlq+MtUASFw4fvC go/YA8vF2ZSp1pj9J+jsumw5JcuUeGSsxnM1LKxOHn8qcnoA6cGg29cbXnOxvu470Lu+Je9eg UKEJPfAFwqtM6OVmaBo0t/2uSmHGMOmZaXukJvKJh39tp4UD9m3+msIM4PAmMWLoa0MqHCR/7 GivQCT+5COGnL9/9d4eCoo+xGlF+TXYfJiFmie0eElWHsdzkKqP4GVBCb5k3uPvs2M/pvYNEc xJbZdSxQZf/3Zot/JszCFO0aN3yBf9Fw3pb91iw7CtSpsMjlkw= X-Rspamd-Queue-Id: 0C4AA1A4A7 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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 NOMMU kernels without CONFIG_MEMCG_KMEM, we now get a harmless warning about an unused function: mm/memcontrol.c:2595:13: error: unused function 'cancel_charge' [-Werror,-Wunused-function] Hide this function in a matching #ifdef. Fixes: 5bd144bf764c ("mm: memcontrol: drop unused try/commit/cancel charge API") Signed-off-by: Arnd Bergmann Acked-by: Johannes Weiner Acked-by: Michal Hocko --- mm/memcontrol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f14da7a7348b..7bfca0abb8e1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2592,6 +2592,7 @@ static int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, return 0; } +#if defined(CONFIG_MEMCG_KMEM) || defined(CONFIG_MMU) static void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages) { if (mem_cgroup_is_root(memcg)) @@ -2603,6 +2604,7 @@ static void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages) css_put_many(&memcg->css, nr_pages); } +#endif static void commit_charge(struct page *page, struct mem_cgroup *memcg) {