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=-7.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 9AC0BC433DF for ; Fri, 29 May 2020 08:19:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 64F0020897 for ; Fri, 29 May 2020 08:19:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64F0020897 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AEB65800B9; Fri, 29 May 2020 04:19:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A743380010; Fri, 29 May 2020 04:19:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93CAD800B9; Fri, 29 May 2020 04:19:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0109.hostedemail.com [216.40.44.109]) by kanga.kvack.org (Postfix) with ESMTP id 7809180010 for ; Fri, 29 May 2020 04:19:13 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 3A083180AD80F for ; Fri, 29 May 2020 08:19:13 +0000 (UTC) X-FDA: 76869056586.20.wren95_3357229c0ad1c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 1FD19180C08E0 for ; Fri, 29 May 2020 08:19:13 +0000 (UTC) X-HE-Tag: wren95_3357229c0ad1c X-Filterd-Recvd-Size: 4134 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 08:19:12 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id l11so2500361wru.0 for ; Fri, 29 May 2020 01:19:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=G1DHa95zQ0abeyOJd2kcqi3BLBnsdfZBM/mDmW1g3Eg=; b=aJJtxiIvaoHLf1W/4vdDu9iBiiBOmlzPe+qgh8EWzzz5dM5ROhda/ne3aeGvT889H4 wFRIP3N6t3SD0pw/eZT/ietnZE6oQZnX03npk0xrkewlAXZZLLyatJNzfc/mu6JEj0fS SSzAErV9M3DtsyVl6dDfAXfpmoi8jzSOXLv+jrBNAVzcGFDW4vWtB0EfX6tgPVDxNy3D XjwKyKtSc9XH4NzpGDzgqJgYpC+MebzMtSLO5E0evpFdLx3VPBwdByPBwHrg/boWkekT PA02bLqJk48ZIvQcqRIaYM63MoJptjiVIF/6/GPMNJgur+jQcrr6MRdHzrMuKqtVYRA1 mQfA== X-Gm-Message-State: AOAM531qWfrWBD/OzAdnzjrVXsp1xEXwIV1W+Edo4INInI4AA+/weVIR wcpL5TCjyQINj47cyr5efIo= X-Google-Smtp-Source: ABdhPJy2lltktDx3yZpzMUTqglOo2k7IPNMZmSEVKGS7oa0sLsL8qEDzCDuGKYYBzTmO8CsZpcFRyw== X-Received: by 2002:a5d:6586:: with SMTP id q6mr6115612wru.319.1590740351536; Fri, 29 May 2020 01:19:11 -0700 (PDT) Received: from localhost (ip-37-188-185-40.eurotel.cz. [37.188.185.40]) by smtp.gmail.com with ESMTPSA id a6sm8957998wrn.38.2020.05.29.01.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 01:19:10 -0700 (PDT) Date: Fri, 29 May 2020 10:19:09 +0200 From: Michal Hocko To: Arnd Bergmann Cc: Johannes Weiner , Vladimir Davydov , Andrew Morton , Stephen Rothwell , Joonsoo Kim , Alex Shi , Hugh Dickins , "Kirill A. Shutemov" , 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: Re: [PATCH] mm: memcontrol: fix an unused-function warning Message-ID: <20200529081909.GG4406@dhcp22.suse.cz> References: <20200528095640.151454-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200528095640.151454-1-arnd@arndb.de> X-Rspamd-Queue-Id: 1FD19180C08E0 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 Thu 28-05-20 11:56:26, Arnd Bergmann wrote: > 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") This is a linux-next sha1 which is not valid anymore. I would just drop the tag. > Signed-off-by: Arnd Bergmann Acked-by: Michal Hocko Thanks! > --- > 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) > { > -- > 2.26.2 > -- Michal Hocko SUSE Labs