aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386/smp.h
diff options
context:
space:
mode:
authorJiri Kosina <jikos@jikos.cz>2006-10-06 05:11:56 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 14:15:12 -0400
commit815a965b0e6d925646e1f6012175830ef21e0d21 (patch)
tree3ed45d661b2ff2c8d00f4c28ebefac8521b54be3 /include/asm-i386/smp.h
parent428929a234d2c4b8a6d0145d0dcf687fcfa27325 (diff)
[PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable
CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could be compiled also for UP archs. The patch fixes compilation error in include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC && !CONFIG_SMP Signed-off-by: Jiri Kosina <jikos@jikos.cz> Acked-by: Keith Mannthey <kmannth@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/smp.h')
-rw-r--r--include/asm-i386/smp.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index 6aa1206f6e2a..bd59c1508e71 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -46,8 +46,6 @@ extern u8 x86_cpu_to_apicid[];
46 46
47#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu] 47#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]
48 48
49extern u8 apicid_2_node[];
50
51#ifdef CONFIG_HOTPLUG_CPU 49#ifdef CONFIG_HOTPLUG_CPU
52extern void cpu_exit_clear(void); 50extern void cpu_exit_clear(void);
53extern void cpu_uninit(void); 51extern void cpu_uninit(void);
@@ -101,6 +99,9 @@ extern unsigned int num_processors;
101#endif 99#endif
102 100
103#ifndef __ASSEMBLY__ 101#ifndef __ASSEMBLY__
102
103extern u8 apicid_2_node[];
104
104#ifdef CONFIG_X86_LOCAL_APIC 105#ifdef CONFIG_X86_LOCAL_APIC
105static __inline int logical_smp_processor_id(void) 106static __inline int logical_smp_processor_id(void)
106{ 107{