x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 10 May 2008 14:01:48 +0000 (09:01 -0500)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 May 2008 19:27:51 +0000 (21:27 +0200)
commitf8955ebe3ea85a9d3ff2685ee64386fd34434cf3
treeb3109fa749c43268412154da28c7d69326380d94
parent8965eb19386fdf5ccd0ef8b02593eb8560aa3416
x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol

The phys_cpu_present_map is an expected symbol in the SMP harness.
Unfortunately, x86 recently moved this and a few others to
kernel/setup.c where it doesn't quite work because voyager has to
define its own.  Use CONFIG_X86_LOCAL_APIC to isolate these
definitions and fix up another area in setup.c where CONFIG_X86_SMP
should be used instead of CONFIG_SMP.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Cc: toralf.foerster@gmx.de
Cc: Mike Travis <travis@sgi.com>
Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/setup.c