dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Jiri Kosina 2006-10-06 11:11:56 +02:00 committed by Linus Torvalds
parent 428929a234
commit 815a965b0e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/asm-i386/smp.h
View File

@ -46,8 +46,6 @@ extern u8 x86_cpu_to_apicid[];
#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]
extern u8 apicid_2_node[];
#ifdef CONFIG_HOTPLUG_CPU
extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
@ -101,6 +99,9 @@ extern unsigned int num_processors;
#endif
#ifndef __ASSEMBLY__
extern u8 apicid_2_node[];
#ifdef CONFIG_X86_LOCAL_APIC
static __inline int logical_smp_processor_id(void)
{