Commit 45ccaf47 authored by Mike Snitzer's avatar Mike Snitzer

Merge branch 'slab/urgent' of...

Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux into for-3.16-rcX
parents 048e5a07 69461747
...@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size) ...@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size)
continue; continue;
} }
#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON) #if !defined(CONFIG_SLUB)
if (!strcmp(s->name, name)) { if (!strcmp(s->name, name)) {
pr_err("%s (%s): Cache name already exists.\n", pr_err("%s (%s): Cache name already exists.\n",
__func__, name); __func__, name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment