diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-03 12:06:21 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-03 12:06:21 +0100 |
| commit | 123b2dd10b4659911ef38458573a57f94cbf5448 (patch) | |
| tree | 536765a44b6fb25f024a8387f4677f994015b041 /mm/slab_common.c | |
| parent | f62c95fd4041d669159dd76ac0bb2a7f86b5b05d (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| download | linux-123b2dd10b4659911ef38458573a57f94cbf5448.tar.gz linux-123b2dd10b4659911ef38458573a57f94cbf5448.tar.bz2 linux-123b2dd10b4659911ef38458573a57f94cbf5448.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Several important fixes went in between 3.18-rc1 and 3.18-rc3, so
KVM/x86 work for 3.19 will be based on 3.18-rc3.
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 3a6e0cfdf03a..406944207b61 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -93,16 +93,6 @@ static int kmem_cache_sanity_check(const char *name, size_t size) s->object_size); continue; } - -#if !defined(CONFIG_SLUB) - if (!strcmp(s->name, name)) { - pr_err("%s (%s): Cache name already exists.\n", - __func__, name); - dump_stack(); - s = NULL; - return -EINVAL; - } -#endif } WARN_ON(strchr(name, ' ')); /* It confuses parsers */ |