x86: move x86_bios_cpu_apicid to apic_32.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index f0abd59a2a3c5caceb198a71112db9b236fe37c9..65036bbaf0589df0dee76ce5b976ffb8614e95ab 100644 (file)
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -55,6 +55,9 @@ unsigned long mp_lapic_addr;
 /* Processor that is doing the boot up */
 unsigned int boot_cpu_physical_apicid = -1U;
 
+DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
+EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
+
 /*
  * Knob to control our willingness to enable the local APIC.
  *

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 9b61b50a96c90f69bbac35a0e7dbd999d8d8ce1b..c79d6e06c3fa9d2caa3cb7f36b9f0e8a6f3f8be4 100644 (file)
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -75,10 +75,6 @@ unsigned int boot_cpu_physical_apicid = -1U;
 physid_mask_t phys_cpu_present_map;
 #endif
 
-#ifndef CONFIG_SMP
-DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
-#endif
-
 /*
  * Intel MP BIOS table parsing routines:
  */

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index d3402e2c57eb5df1711e146fd5ad7fbd78061e50..7bcee1584b50d22dc1495e098b775faea242729d 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -83,8 +83,6 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
 u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
                                = { [0 ... NR_CPUS-1] = BAD_APICID };
 void *x86_bios_cpu_apicid_early_ptr;
-DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
-EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
 
 /* Internal processor count */
 unsigned int num_processors;