2006-11-16 02:45:27

by Chris Wright

[permalink] [raw]
Subject: [patch 10/30] init_reap_node() initialization fix

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Daniel Yeisley <[email protected]>

It looks like there is a bug in init_reap_node() in slab.c that can cause
multiple oops's on certain ES7000 configurations. The variable reap_node
is defined per cpu, but only initialized on a single CPU. This causes an
oops in next_reap_node() when __get_cpu_var(reap_node) returns the wrong
value. Fix is below.

Signed-off-by: Dan Yeisley <[email protected]>
Cc: Andi Kleen <[email protected]>
Acked-by: Christoph Lameter <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Manfred Spraul <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
mm/slab.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.18.2.orig/mm/slab.c
+++ linux-2.6.18.2/mm/slab.c
@@ -867,7 +867,7 @@ static void init_reap_node(int cpu)
if (node == MAX_NUMNODES)
node = first_node(node_online_map);

- __get_cpu_var(reap_node) = node;
+ per_cpu(reap_node, cpu) = node;
}

static void next_reap_node(void)

--