Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[cascardo/linux.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index e2e98af..0b7bb39 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -571,7 +571,7 @@ memcg_accumulate_slabinfo(struct kmem_cache *s, struct slabinfo *info)
                return;
 
        for_each_memcg_cache_index(i) {
-               c = cache_from_memcg(s, i);
+               c = cache_from_memcg_idx(s, i);
                if (!c)
                        continue;