Skip to content

Commit

Permalink
[PATCH] x86_64: fix the BP node_to_cpumask
Browse files Browse the repository at this point in the history
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: Shai Fultheim <shai@scalex86.org>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Ravikiran G Thirumalai authored and Linus Torvalds committed Sep 30, 2005
1 parent 2dd960d commit e6a045a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/x86_64/mm/numa.c
Expand Up @@ -178,7 +178,6 @@ void __init numa_init_array(void)
rr++;
}

set_bit(0, &node_to_cpumask[cpu_to_node(0)]);
}

#ifdef CONFIG_NUMA_EMU
Expand Down Expand Up @@ -266,9 +265,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)

__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)]);
}

unsigned long __init numa_free_all_bootmem(void)
Expand Down

0 comments on commit e6a045a

Please sign in to comment.