Commit 9c09a95c authored Jan 24, 2008 by Mel Gorman Committed by Linus Torvalds Jan 24, 2008

slab: partially revert list3 changes



Partial revert the changes made by 04231b30
to the kmem_list3 management. On a machine with a memoryless node, this
BUG_ON was triggering

	static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
	{
		struct list_head *entry;
		struct slab *slabp;
		struct kmem_list3 *l3;
		void *obj;
		int x;

		l3 = cachep->nodelists[nodeid];
		BUG_ON(!l3);

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Christoph Lameter <clameter@sgi.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c5c99429

mm/slab.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1590,7 +1590,7 @@ void __init kmem_cache_init(void)
		/* Replace the static kmem_list3 structures for the boot cpu */
		init_list(&cache_cache, &initkmem_list3[CACHE_CACHE], node);

		for_each_node_state(nid, N_NORMAL_MEMORY) {
		for_each_online_node(nid) {
		init_list(malloc_sizes[INDEX_AC].cs_cachep,
		&initkmem_list3[SIZE_AC + nid], nid);

		@@ -1968,7 +1968,7 @@ static void __init set_up_list3s(struct kmem_cache *cachep, int index)
		{
		int node;

		for_each_node_state(node, N_NORMAL_MEMORY) {
		for_each_online_node(node) {
		cachep->nodelists[node] = &initkmem_list3[index + node];
		cachep->nodelists[node]->next_reap = jiffies +
		REAPTIMEOUT_LIST3 +
		@@ -3815,7 +3815,7 @@ static int alloc_kmemlist(struct kmem_cache *cachep)
		struct array_cache *new_shared;
		struct array_cache **new_alien = NULL;

		for_each_node_state(node, N_NORMAL_MEMORY) {
		for_each_online_node(node) {

		if (use_alien_caches) {
		new_alien = alloc_alien_cache(node, cachep->limit);

Admin message