From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755213AbcHXIng (ORCPT ); Wed, 24 Aug 2016 04:43:36 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34883 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753456AbcHXImh (ORCPT ); Wed, 24 Aug 2016 04:42:37 -0400 Date: Wed, 24 Aug 2016 10:41:21 +0200 From: Michal Hocko To: Arnd Bergmann Cc: Vladimir Davydov , Johannes Weiner , Andrew Morton , Tejun Heo , Mel Gorman , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: memcontrol: avoid unused function warning Message-ID: <20160824084121.GF31179@dhcp22.suse.cz> References: <20160824082301.632345-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160824082301.632345-1-arnd@arndb.de> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed 24-08-16 10:22:43, Arnd Bergmann wrote: > A bugfix in v4.8-rc2 introduced a harmless warning when CONFIG_MEMCG_SWAP > is disabled but CONFIG_MEMCG is enabled: > > mm/memcontrol.c:4085:27: error: 'mem_cgroup_id_get_online' defined but not used [-Werror=unused-function] > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > > This adds an extra #ifdef that matches the one around the caller to > avoid the warning. Thanks for fixing that! Could you please move the function to the same ifdef section as its users please. > Signed-off-by: Arnd Bergmann > Fixes: 1f47b61fb407 ("mm: memcontrol: fix swap counter leak on swapout from offline cgroup") Anyway Acked-by: Michal Hocko > --- > mm/memcontrol.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 2ff0289ad061..e8d787163b65 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4082,6 +4082,7 @@ static void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n) > atomic_add(n, &memcg->id.ref); > } > > +#ifdef CONFIG_MEMCG_SWAP > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > { > while (!atomic_inc_not_zero(&memcg->id.ref)) { > @@ -4099,6 +4100,7 @@ static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > } > return memcg; > } > +#endif > > static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) > { > -- > 2.9.0 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email@kvack.org -- Michal Hocko SUSE Labs