From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754508AbeCRUY4 (ORCPT ); Sun, 18 Mar 2018 16:24:56 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:42228 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbeCRUYx (ORCPT ); Sun, 18 Mar 2018 16:24:53 -0400 X-Google-Smtp-Source: AG47ELtk6e0qhgkpQbHyE6rdWWbk67KpSTJDf1iU0sFgBGfd31/puMRGyxEUCsH+4oqyArue0Tx7mw== Date: Sun, 18 Mar 2018 13:24:51 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Andrew Morton cc: Shakeel Butt , Jan Kara , Amir Goldstein , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Greg Thelen , Johannes Weiner , Michal Hocko , Vladimir Davydov , Mel Gorman , Vlastimil Babka , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch -mm] mm: memcg: remote memcg charging for kmem allocations fix In-Reply-To: <20180305182951.34462-2-shakeelb@google.com> Message-ID: References: <20180305182951.34462-1-shakeelb@google.com> <20180305182951.34462-2-shakeelb@google.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org fix build warning for CONFIG_SLOB: mm/memcontrol.c:706:27: warning: 'get_mem_cgroup' defined but not used [-Wunused-function] static struct mem_cgroup *get_mem_cgroup(struct mem_cgroup *memcg) Reported-by: kbuild test robot Signed-off-by: David Rientjes --- mm/memcontrol.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -701,15 +701,6 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) return memcg; } -static struct mem_cgroup *get_mem_cgroup(struct mem_cgroup *memcg) -{ - rcu_read_lock(); - if (!css_tryget_online(&memcg->css)) - memcg = NULL; - rcu_read_unlock(); - return memcg; -} - /** * mem_cgroup_iter - iterate over memory cgroup hierarchy * @root: hierarchy root @@ -2128,6 +2119,15 @@ static void commit_charge(struct page *page, struct mem_cgroup *memcg, } #ifndef CONFIG_SLOB +static struct mem_cgroup *get_mem_cgroup(struct mem_cgroup *memcg) +{ + rcu_read_lock(); + if (!css_tryget_online(&memcg->css)) + memcg = NULL; + rcu_read_unlock(); + return memcg; +} + static int memcg_alloc_cache_id(void) { int id, size;