diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-14 10:00:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-14 10:00:36 -0700 |
| commit | 4b60667a06375c8cce1deaf15730eca90eaa01dd (patch) | |
| tree | 561685cd2e658ab247a29b22329105681341cb80 /mm | |
| parent | Merge tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | slab_common: Do not check for duplicate slab names (diff) | |
| download | linux-dev-4b60667a06375c8cce1deaf15730eca90eaa01dd.tar.xz linux-dev-4b60667a06375c8cce1deaf15730eca90eaa01dd.zip | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
Pull SLAB fix from Pekka Enberg:
"A regression fix for overly eager slab cache name checks"
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
slab_common: Do not check for duplicate slab names
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index a3443278ce3a..e2e98af703ea 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -56,6 +56,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name, continue; } +#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON) /* * For simplicity, we won't check this in the list of memcg * caches. We have control over memcg naming, and if there @@ -69,6 +70,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name, s = NULL; return -EINVAL; } +#endif } WARN_ON(strchr(name, ' ')); /* It confuses parsers */ |