Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/penberg/linux into for-3.16-rcX
mariux64 · Jul 22, 2014 · 45ccaf4 · 45ccaf4
2 parents 048e5a0 + 6946174
commit 45ccaf4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mm/slab_common.c b/mm/slab_common.c
@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size)
 			continue;
 		}
 
-#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON)
+#if !defined(CONFIG_SLUB)
 		if (!strcmp(s->name, name)) {
 			pr_err("%s (%s): Cache name already exists.\n",
 			       __func__, name);