projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0e1d1b
)
SLUB: Fix CONFIG_SLUB_DEBUG use for CONFIG_NUMA
author
Christoph Lameter
<clameter@sgi.com>
Tue, 17 Jul 2007 11:03:32 +0000
(
04:03
-0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 17:23:02 +0000
(10:23 -0700)
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
patch
|
blob
|
history
diff --git
a/mm/slub.c
b/mm/slub.c
index
1c5d6a0
..
52a4f44
100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-1853,7
+1853,9
@@
static void init_kmem_cache_node(struct kmem_cache_node *n)
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
@@
static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag
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);