Skip to content

Commit

Permalink
[PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Kosina authored and Linus Torvalds committed Oct 6, 2006
1 parent 428929a commit 815a965
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions include/asm-i386/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 815a965

Please sign in to comment.