Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45ccaf47 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

Merge branch 'slab/urgent' of... 

Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux into for-3.16-rcX
parents 048e5a07 69461747

mm/slab_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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);