Commit f6acb635 authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slub: #ifdef simplification 



If we make SLUB_DEBUG depend on SYSFS then we can simplify some
#ifdefs and avoid others.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent f715e6f1

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ config VM_EVENT_COUNTERS 
config SLUB_DEBUG

	default y

	bool "Enable SLUB debugging support" if EMBEDDED

	depends on SLUB

	depends on SLUB && SYSFS

	help

	  SLUB has extensive debug support features. Disabling these can

	  result in significant savings in code size. This also disables

mm/slub.c

+2 −4
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ struct track { 


enum track_item { TRACK_ALLOC, TRACK_FREE };



#if defined(CONFIG_SYSFS) && defined(CONFIG_SLUB_DEBUG)

#ifdef CONFIG_SLUB_DEBUG

static int sysfs_slab_add(struct kmem_cache *);

static int sysfs_slab_alias(struct kmem_cache *, const char *);

static void sysfs_slab_remove(struct kmem_cache *);
@@ -3247,7 +3247,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, 
	return slab_alloc(s, gfpflags, node, caller);

}



#if (defined(CONFIG_SYSFS) && defined(CONFIG_SLUB_DEBUG)) || defined(CONFIG_SLABINFO)

#ifdef CONFIG_SLUB_DEBUG

static unsigned long count_partial(struct kmem_cache_node *n,

					int (*get_count)(struct page *))

{
@@ -3276,9 +3276,7 @@ static int count_free(struct page *page) 
{

	return page->objects - page->inuse;

}

#endif



#if defined(CONFIG_SYSFS) && defined(CONFIG_SLUB_DEBUG)

static int validate_slab(struct kmem_cache *s, struct page *page,

						unsigned long *map)

{