aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/genapic_64.c6
-rw-r--r--arch/x86/kernel/smpboot.c3
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 7df38c4c8575..9546ef408b92 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -25,12 +25,6 @@
25#include <acpi/acpi_bus.h> 25#include <acpi/acpi_bus.h>
26#endif 26#endif
27 27
28/* which logical CPU number maps to which CPU (physical APIC ID) */
29#ifdef CONFIG_SMP
30u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata
31 = { [0 ... NR_CPUS-1] = BAD_APICID };
32void *x86_cpu_to_apicid_early_ptr;
33#endif
34DEFINE_PER_CPU(int, x2apic_extra_bits); 28DEFINE_PER_CPU(int, x2apic_extra_bits);
35 29
36struct genapic __read_mostly *genapic = &apic_flat; 30struct genapic __read_mostly *genapic = &apic_flat;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7e6aa1c790a2..e3ea074ba6a4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -72,12 +72,13 @@
72 * integrate apic between arches, we can probably do a better job, but 72 * integrate apic between arches, we can probably do a better job, but
73 * right now, they'll stay here -- glommer 73 * right now, they'll stay here -- glommer
74 */ 74 */
75#ifdef CONFIG_X86_32 75
76/* which logical CPU number maps to which CPU (physical APIC ID) */ 76/* which logical CPU number maps to which CPU (physical APIC ID) */
77u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata = 77u16 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
81u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata 82u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
82 = { [0 ... NR_CPUS-1] = BAD_APICID }; 83 = { [0 ... NR_CPUS-1] = BAD_APICID };
83void *x86_bios_cpu_apicid_early_ptr; 84void *x86_bios_cpu_apicid_early_ptr;