Commit e6a045a5 authored by Ravikiran G Thirumalai's avatar Ravikiran G Thirumalai Committed by Linus Torvalds

[PATCH] x86_64: fix the BP node_to_cpumask

Fix the BP node_to_cpumask.  2.6.14-rc* broke the boot cpu bit as the
cpu_to_node(0) is now not setup early enough for numa_init_array.
cpu_to_node[] is setup much later at srat_detect_node on acpi srat based
em64t machines.  This seems like a problem on amd machines too, Tested on
em64t though.  /sys/devices/system/node/node0/cpumap shows up sanely after
this patch.

Signed off by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: default avatarShai Fultheim <shai@scalex86.org>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2dd960d6
...@@ -178,7 +178,6 @@ void __init numa_init_array(void) ...@@ -178,7 +178,6 @@ void __init numa_init_array(void)
rr++; rr++;
} }
set_bit(0, &node_to_cpumask[cpu_to_node(0)]);
} }
#ifdef CONFIG_NUMA_EMU #ifdef CONFIG_NUMA_EMU
...@@ -266,8 +265,6 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) ...@@ -266,8 +265,6 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
__cpuinit void numa_add_cpu(int cpu) __cpuinit void numa_add_cpu(int cpu)
{ {
/* BP is initialized elsewhere */
if (cpu)
set_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]); set_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment