aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-27 16:55:10 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:31 -0400
commit837e0e7a7f574220c87c552cca9f425575418621 (patch)
treece1f1a8441e243b57599605f18741e22b665b28f /arch/x86
parent0c254e38d294d3720588e2a1fd954d828073f1dc (diff)
x86: move boot_cpu_physical_apicid to apic_32.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic_32.c3
-rw-r--r--arch/x86/kernel/mpparse_32.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 68ea75fa6d35..f0abd59a2a3c 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -52,6 +52,9 @@
52 52
53unsigned long mp_lapic_addr; 53unsigned long mp_lapic_addr;
54 54
55/* Processor that is doing the boot up */
56unsigned int boot_cpu_physical_apicid = -1U;
57
55/* 58/*
56 * Knob to control our willingness to enable the local APIC. 59 * Knob to control our willingness to enable the local APIC.
57 * 60 *
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index e5376dc5d0cc..9143810bb637 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -61,13 +61,11 @@ int nr_ioapics;
61 61
62int pic_mode; 62int pic_mode;
63 63
64/* Processor that is doing the boot up */
65unsigned int boot_cpu_physical_apicid = -1U;
66
67/* Make it easy to share the UP and SMP code: */ 64/* Make it easy to share the UP and SMP code: */
68#ifndef CONFIG_X86_SMP 65#ifndef CONFIG_X86_SMP
69unsigned int num_processors; 66unsigned int num_processors;
70unsigned disabled_cpus __cpuinitdata; 67unsigned disabled_cpus __cpuinitdata;
68unsigned int boot_cpu_physical_apicid = -1U;
71#endif 69#endif
72 70
73/* Make it easy to share the UP and SMP code: */ 71/* Make it easy to share the UP and SMP code: */