summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/mach-bigsmp/mach_apic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
commitd028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch)
tree6bd73a5c70b407491dc9d40ecb9e95b48233d004 /include/asm-x86/mach-bigsmp/mach_apic.h
parentMerge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentx86: build fix for "x86: fix C1E && nx6325 stability problem" (diff)
downloadlinux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.xz
linux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.zip
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'include/asm-x86/mach-bigsmp/mach_apic.h')
-rw-r--r--include/asm-x86/mach-bigsmp/mach_apic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/mach-bigsmp/mach_apic.h b/include/asm-x86/mach-bigsmp/mach_apic.h
index 8327907c79bf..017c8c19ad8f 100644
--- a/include/asm-x86/mach-bigsmp/mach_apic.h
+++ b/include/asm-x86/mach-bigsmp/mach_apic.h
@@ -81,7 +81,7 @@ static inline int multi_timer_check(int apic, int irq)
static inline int apicid_to_node(int logical_apicid)
{
- return (0);
+ return apicid_2_node[hard_smp_processor_id()];
}
static inline int cpu_present_to_apicid(int mps_cpu)