diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-23 15:14:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-23 15:14:46 -0700 |
| commit | 355cb09304c3387e43946a83b1fa8a34dc8976c0 (patch) | |
| tree | d0e8c17f67b484f4c834047f3cc22c3b42abcd35 /mm | |
| parent | ed4a1084bc8dc47328392aa31e0bc04eb2dbffbb (diff) | |
| parent | 45ccaf4764278f6544db412d38a1bae056ee3acc (diff) | |
| download | op-kernel-dev-355cb09304c3387e43946a83b1fa8a34dc8976c0.zip op-kernel-dev-355cb09304c3387e43946a83b1fa8a34dc8976c0.tar.gz | |
Merge tag 'urgent-slab-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull slab fix from Mike Snitzer:
"This fixes the broken duplicate slab name check in
kmem_cache_sanity_check() that has been repeatedly reported (as
recently as today against Fedora rawhide).
Pekka seemed to have it staged for a late 3.15-rc in his 'slab/urgent'
branch but never sent a pull request, see:
https://lkml.org/lkml/2014/5/23/648"
* tag 'urgent-slab-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
slab_common: fix the check for duplicate slab names
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 735e01a..d31c4ba 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); |
