The patch titled
Subject: mm: memcg: remote memcg charging for kmem allocations fix
has been removed from the -mm tree. Its filename was
mm-memcg-remote-memcg-charging-for-kmem-allocations-fix.patch
This patch was dropped because it was folded into mm-memcg-remote-memcg-charging-for-kmem-allocations.patch
------------------------------------------------------
From: David Rientjes <rientjes@xxxxxxxxxx>
Subject: mm: memcg: remote memcg charging for kmem allocations fix
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)
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1803181318530.241887@xxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -puN mm/memcontrol.c~mm-memcg-remote-memcg-charging-for-kmem-allocations-fix mm/memcontrol.c
--- a/mm/memcontrol.c~mm-memcg-remote-memcg-charging-for-kmem-allocations-fix
+++ a/mm/memcontrol.c
@@ -701,15 +701,6 @@ static struct mem_cgroup *get_mem_cgroup
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 *p
}
#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;
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxx are
mm-memcg-remote-memcg-charging-for-kmem-allocations.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
