Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux into for-3.16-rcX

2014-07-22 18:38:27 -04:00 · 2014-07-22 18:38:27 -04:00 · 45ccaf4764
commit 45ccaf4764
parent 048e5a07f2 694617474e
1 changed files with 1 additions and 1 deletions
--- 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);