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

1 files changed, 3 insertions, 1 deletions

diff --git a/mm/slub.c b/mm/slub.c
index a47df0aa5d36..19436f538760 100644
--- 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;