From: Andi Kleen <ak@suse.de>
Date: Tue, 28 Nov 2006 19:12:59 +0000 (+0100)
Subject: [PATCH] i386: Fix compilation with UP genericarch
X-Git-Tag: v2.6.19~7^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=38b5b036b91248be8033d42dd0778b1c75c5af58;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index ef0671e5d5c..43e5bd8f4a1 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 */