From a6fb26312770715325fed841c54a89657e6e704f Mon Sep 17 00:00:00 2001 From: Keith Mannthey Date: Tue, 3 Oct 2006 18:25:52 -0700 Subject: [PATCH] --- yaml --- r: 38336 b: refs/heads/master c: 78b656b8bf933101b42409b4492734b23427bfc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/smpboot.c | 2 +- trunk/include/asm-i386/mach-summit/mach_apic.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7056bcd688c9..f4bf9e9f3ab8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 708e16892e1646594a29eaa7ac7b209b600b9fd2 +refs/heads/master: 78b656b8bf933101b42409b4492734b23427bfc3 diff --git a/trunk/arch/i386/kernel/smpboot.c b/trunk/arch/i386/kernel/smpboot.c index 9d93ecf6d999..4bb8b77cd65b 100644 --- a/trunk/arch/i386/kernel/smpboot.c +++ b/trunk/arch/i386/kernel/smpboot.c @@ -648,7 +648,7 @@ static void map_cpu_to_logical_apicid(void) { int cpu = smp_processor_id(); int apicid = logical_smp_processor_id(); - int node = apicid_to_node(hard_smp_processor_id()); + int node = apicid_to_node(apicid); if (!node_online(node)) node = first_online_node; diff --git a/trunk/include/asm-i386/mach-summit/mach_apic.h b/trunk/include/asm-i386/mach-summit/mach_apic.h index 254a0fe01c6a..ef0671e5d5c5 100644 --- a/trunk/include/asm-i386/mach-summit/mach_apic.h +++ b/trunk/include/asm-i386/mach-summit/mach_apic.h @@ -88,7 +88,7 @@ static inline void clustered_apic_check(void) static inline int apicid_to_node(int logical_apicid) { - return apicid_2_node[logical_apicid]; + return apicid_2_node[hard_smp_processor_id()]; } /* Mapping from cpu number to logical apicid */