| commit | 45ccaf4764278f6544db412d38a1bae056ee3acc | [log] [tgz] |
|---|---|---|
| author | Mike Snitzer <snitzer@redhat.com> | Tue Jul 22 18:38:27 2014 -0400 |
| committer | Mike Snitzer <snitzer@redhat.com> | Tue Jul 22 18:38:27 2014 -0400 |
| tree | b8dff9fc6a08e4a11765fda710f2e6f02b9878f3 | |
| 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
diff --git a/mm/slab_common.c b/mm/slab_common.c index 735e01a..d31c4ba 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c
@@ -55,7 +55,7 @@ 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);