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

snitm · snitm · commit 45ccaf476427 · 2014-07-22T18:38:27.000-04:00
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);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size)`
`55`	`55`	`continue;`
`56`	`56`	`}`
`57`	`57`
`58`		`-#if !defined(CONFIG_SLUB) \|\| !defined(CONFIG_SLUB_DEBUG_ON)`
	`58`	`+#if !defined(CONFIG_SLUB)`
`59`	`59`	`if (!strcmp(s->name, name)) {`
`60`	`60`	`pr_err("%s (%s): Cache name already exists.\n",`
`61`	`61`	`__func__, name);`