diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-05 09:04:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-05 09:04:59 +1000 |
| commit | 5d42f82a9b8c5168d75cf59307cd271feca94464 (patch) | |
| tree | a7049189a2c814589b3ad7e6e776fb736f980967 /mm/slab_common.c | |
| parent | c759606c96dc052373d4c36ea383595da46b04e9 (diff) | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
Merge tag 'v3.16' into drm-next
Linux 3.16
backmerge requested by i915, nouveau and radeon authors
Conflicts:
drivers/gpu/drm/i915/i915_gem_render_state.c
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'mm/slab_common.c')
| -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); |