aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/mpparse_64.c6
-rw-r--r--arch/x86/kernel/smpboot.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 8d7365511ac0..3196c2318640 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -55,12 +55,6 @@ int mp_irq_entries;
55 55
56int nr_ioapics; 56int nr_ioapics;
57 57
58#ifdef CONFIG_SMP
59u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
60 = {[0 ... NR_CPUS - 1] = BAD_APICID };
61void *x86_bios_cpu_apicid_early_ptr;
62#endif
63
64/* Make it easy to share the UP and SMP code: */ 58/* Make it easy to share the UP and SMP code: */
65#ifndef CONFIG_X86_SMP 59#ifndef CONFIG_X86_SMP
66unsigned int num_processors; 60unsigned int num_processors;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index e3ea074ba6a4..abf63767cd46 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -78,11 +78,11 @@ u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
78 { [0 ... NR_CPUS-1] = BAD_APICID }; 78 { [0 ... NR_CPUS-1] = BAD_APICID };
79void *x86_cpu_to_apicid_early_ptr; 79void *x86_cpu_to_apicid_early_ptr;
80 80
81#ifdef CONFIG_X86_32
82u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata 81u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
83 = { [0 ... NR_CPUS-1] = BAD_APICID }; 82 = { [0 ... NR_CPUS-1] = BAD_APICID };
84void *x86_bios_cpu_apicid_early_ptr; 83void *x86_bios_cpu_apicid_early_ptr;
85 84
85#ifdef CONFIG_X86_32
86u8 apicid_2_node[MAX_APICID]; 86u8 apicid_2_node[MAX_APICID];
87#endif 87#endif
88 88