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

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

slub: Deal with config variable dependencies 



count_partial() is used by both slabinfo and the sysfs proc support. Move
the function directly before the beginning of the sysfs code so that it can
be easily found. Rework the preprocessor conditional to take into account
that slub sysfs support depends on CONFIG_SYSFS *and* CONFIG_SLUB_DEBUG.

Make CONFIG_SLUB_STATS depend on CONFIG_SLUB_DEBUG and CONFIG_SYSFS. There
is no point of keeping statistics if no one can restrive them.

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

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ config SLUB_DEBUG_ON 
config SLUB_STATS

	default n

	bool "Enable SLUB performance statistics"

	depends on SLUB

	depends on SLUB && SLUB_DEBUG && SYSFS

	help

	  SLUB statistics are useful to debug SLUBs allocation behavior in

	  order find ways to optimize the allocator. This should never be

mm/slub.c

+15 −15
Original line number Diff line number Diff line
@@ -2688,21 +2688,6 @@ void kfree(const void *x) 
}

EXPORT_SYMBOL(kfree);



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

static unsigned long count_partial(struct kmem_cache_node *n)

{

	unsigned long flags;

	unsigned long x = 0;

	struct page *page;



	spin_lock_irqsave(&n->list_lock, flags);

	list_for_each_entry(page, &n->partial, lru)

		x += page->inuse;

	spin_unlock_irqrestore(&n->list_lock, flags);

	return x;

}

#endif



/*

 * kmem_cache_shrink removes empty slabs from the partial lists and sorts

 * the remaining slabs by the number of items in use. The slabs with the
@@ -3181,6 +3166,21 @@ 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)

static unsigned long count_partial(struct kmem_cache_node *n)

{

	unsigned long flags;

	unsigned long x = 0;

	struct page *page;



	spin_lock_irqsave(&n->list_lock, flags);

	list_for_each_entry(page, &n->partial, lru)

		x += page->inuse;

	spin_unlock_irqrestore(&n->list_lock, flags);

	return x;

}

#endif



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

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

						unsigned long *map)