Merge branch 'slab/urgent' into slab/for-linus

[~andy/linux] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index a47df0aa5d367c637de854de285c99ad9c96cfdd..19436f53876079b6de95e13270d1ef5b22a169c6 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3043,7 +3043,9 @@ static int kmem_cache_open(struct kmem_cache *s,
         *    per node list when we run out of per cpu objects. We only fetch 50%
         *    to keep some capacity around for frees.
         */
-       if (s->size >= PAGE_SIZE)
+       if (kmem_cache_debug(s))
+               s->cpu_partial = 0;
+       else if (s->size >= PAGE_SIZE)
                s->cpu_partial = 2;
        else if (s->size >= 1024)
                s->cpu_partial = 6;