[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:
Родитель
428929a234
Коммит
815a965b0e
|
@ -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)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче