diff --git a/[refs] b/[refs] index 7cc70146d93d..6e87c1964893 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 213eeb9fd9d66c33109e2ace242df214dc3a653d +refs/heads/master: 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 6dc79f8e6ce9..a47df0aa5d36 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -4649,6 +4649,8 @@ static ssize_t cpu_partial_store(struct kmem_cache *s, const char *buf, err = strict_strtoul(buf, 10, &objects); if (err) return err; + if (objects && kmem_cache_debug(s)) + return -EINVAL; s->cpu_partial = objects; flush_all(s);