diff options
| author | Daniel Yeisley <dan.yeisley@unisys.com> | 2006-02-16 00:17:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 00:32:22 +0100 |
| commit | d1db4ec86c7b1bf5b44d2ed3bf84a4bb53c33b1c (patch) | |
| tree | 66f8ce135645da89365410006a5dcdf0fa6a091d /arch/x86_64 | |
| parent | [PATCH] hrtimer: fix multiple macro argument expansion (diff) | |
| download | linux-d1db4ec86c7b1bf5b44d2ed3bf84a4bb53c33b1c.tar.xz linux-d1db4ec86c7b1bf5b44d2ed3bf84a4bb53c33b1c.zip | |
[PATCH] x86_64: early initialization of cpu_to_node
The early initialization of cpu_to_node code as it is now only updates the
cpu_to_node array, and does not update cpu_pda()->nodemember. This will
cause numa_node_id() to return 0 on systems where CPU 0 is not on Node 0.
This leads to a kernel panic in slab.c.
I've tested the patch below on a 16 processor x86_64 ES7000-600 server, and
no longer see the panic I saw with the original 2.6.16-rc3.
Signed-off-by: Dan Yeisley <dan.yeisley@unisys.com>
Acked-by: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index 6ef9f9a76235..22e51beee8d3 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c @@ -351,7 +351,7 @@ void __init init_cpu_to_node(void) continue; if (apicid_to_node[apicid] == NUMA_NO_NODE) continue; - cpu_to_node[i] = apicid_to_node[apicid]; + numa_set_node(i,apicid_to_node[apicid]); } } |