diff options
| author | Mike Snitzer | 2014-07-22 18:38:27 -0400 |
|---|---|---|
| committer | Mike Snitzer | 2014-07-22 18:38:27 -0400 |
| commit | 45ccaf4764278f6544db412d38a1bae056ee3acc (patch) | |
| tree | b8dff9fc6a08e4a11765fda710f2e6f02b9878f3 /mm | |
| parent | 048e5a07f282c57815b3901d4a68a77fa131ce0a (diff) | |
| parent | 694617474e33b8603fc76e090ed7d09376514b1a (diff) | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux into for-3.16-rcX
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 735e01a0db6f..d31c4bacc6a2 100644 --- 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); |