commit 8ab1372fac5684de56c68f0da1ddc90e1c4ce740
author Christoph Lameter <clameter@sgi.com> Tue Jul 17 04:03:32 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jul 17 10:23:02 2007 -0700
tree 42594d334c83ff18655731bf4d9f5d023c9c2886
parent a0e1d1be204612ee83b3afe8aa24c5d27e63d464

SLUB: Fix CONFIG_SLUB_DEBUG use for CONFIG_NUMA

We currently cannot disable CONFIG_SLUB_DEBUG for CONFIG_NUMA.  Now that
embedded systems start to use NUMA we may need this.

Put an #ifdef around places where NUMA only code uses fields only valid
for CONFIG_SLUB_DEBUG.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

mm/slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 1c5d6a0..52a4f44 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1853,7 +1853,9 @@
 	atomic_long_set(&n->nr_slabs, 0);
 	spin_lock_init(&n->list_lock);
 	INIT_LIST_HEAD(&n->partial);
+#ifdef CONFIG_SLUB_DEBUG
 	INIT_LIST_HEAD(&n->full);
+#endif
 }
 
 #ifdef CONFIG_NUMA
@@ -1881,8 +1883,10 @@
 	page->freelist = get_freepointer(kmalloc_caches, n);
 	page->inuse++;
 	kmalloc_caches->node[node] = n;
+#ifdef CONFIG_SLUB_DEBUG
 	init_object(kmalloc_caches, n, 1);
 	init_tracking(kmalloc_caches, n);
+#endif
 	init_kmem_cache_node(n);
 	atomic_long_inc(&n->nr_slabs);
 	add_partial(n, page);