Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-drm-fsl-dcu.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index a983e30843322c37a3ba7983d16a79bd98e9a7ff..eb043bf05f4c57687c0644f11c12bd6b3a654795 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3833,7 +3833,7 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
 
        VM_BUG_ON(!mutex_is_locked(&slab_mutex));
        for_each_memcg_cache_index(i) {
-               c = cache_from_memcg(cachep, i);
+               c = cache_from_memcg_idx(cachep, i);
                if (c)
                        /* return value determined by the parent cache only */
                        __do_tune_cpucache(c, limit, batchcount, shared, gfp);