summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-11-28 20:12:59 +0100
committerAndi Kleen <andi@basil.nowhere.org>2006-11-28 20:12:59 +0100
commit38b5b036b91248be8033d42dd0778b1c75c5af58 (patch)
treefe9ddec43da3f30ff1ec4ff6609375e9d18c98de /include
parent[PATCH] x86-64: Fix warning in io_apic.c (diff)
downloadlinux-38b5b036b91248be8033d42dd0778b1c75c5af58.tar.xz
linux-38b5b036b91248be8033d42dd0778b1c75c5af58.zip
[PATCH] i386: Fix compilation with UP genericarch
Fix arch/i386/mach-generic/built-in.o: In function `apicid_to_node': summit.c:(.text+0x2f): undefined reference to `apicid_2_node' with CONFIG_GENERICH_ARCH and !CONFIG_SMP Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/mach-summit/mach_apic.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index ef0671e5d5c5..43e5bd8f4a19 100644
--- a/include/asm-i386/mach-summit/mach_apic.h
+++ b/include/asm-i386/mach-summit/mach_apic.h
@@ -88,7 +88,11 @@ static inline void clustered_apic_check(void)
static inline int apicid_to_node(int logical_apicid)
{
+#ifdef CONFIG_SMP
return apicid_2_node[hard_smp_processor_id()];
+#else
+ return 0;
+#endif
}
/* Mapping from cpu number to logical apicid */