From: "Andi Kleen" Does not change any semantics because numa_add_cpu checks for CPU 0 anyways. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86_64/kernel/setup.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) diff -puN arch/x86_64/kernel/setup.c~x86_64-minor-clean-up-to-cpu-setup-use-smp_processor_id-instead-of-custom-hack arch/x86_64/kernel/setup.c --- devel/arch/x86_64/kernel/setup.c~x86_64-minor-clean-up-to-cpu-setup-use-smp_processor_id-instead-of-custom-hack 2005-07-27 12:36:10.000000000 -0700 +++ devel-akpm/arch/x86_64/kernel/setup.c 2005-07-27 12:36:10.000000000 -0700 @@ -1081,8 +1081,7 @@ void __cpuinit identify_cpu(struct cpuin else mtrr_ap_init(); #ifdef CONFIG_NUMA - if (c != &boot_cpu_data) - numa_add_cpu(c - cpu_data); + numa_add_cpu(smp_processor_id()); #endif } _