commit acff5a768935f7f39e4e3be03940d70c005ffe96
author Alexey Starikovskiy <astarikovskiy@suse.de> Thu Mar 27 23:55:16 2008 +0300
committer Ingo Molnar <mingo@elte.hu> Thu Apr 17 17:41:31 2008 +0200
tree 7f19dcd80f8ebd9b76a8f5b99d6feb3a9171a7a2
parent fae9811b775655a02dcb51fa0b6423b546468bd1

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>

arch/x86/kernel/apic_32.c

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index f0abd59..65036bb 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -55,6 +55,9 @@
 /* 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.
  *

arch/x86/kernel/mpparse_32.c

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 9b61b50..c79d6e0 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -75,10 +75,6 @@
 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:
  */

arch/x86/kernel/smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index d3402e2..7bcee15 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -83,8 +83,6 @@
 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;