Commit f8955ebe authored by James Bottomley's avatar James Bottomley Committed by Ingo Molnar
Browse files

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's avatarJames Bottomley <>
Cc: WANG Cong <>
Cc: Mike Travis <>
Cc: Alexey Starikovskiy <>
Signed-off-by: default avatarThomas Gleixner <>
parent 8965eb19
......@@ -12,6 +12,7 @@
#include <asm/mpspec.h>
#include <asm/apicdef.h>
unsigned int num_processors;
unsigned disabled_cpus __cpuinitdata;
/* Processor that is doing the boot up */
......@@ -23,8 +24,9 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_X86_SMP)
* Copy data used in early init routines from the initial arrays to the
* per cpu data areas. These arrays then become expendable and the
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment