aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/mpparse_64.c3
-rw-r--r--arch/x86/kernel/smpboot.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index f044e98800ef..8e8e38f2b182 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -65,9 +65,6 @@ unsigned int num_processors;
65 65
66unsigned disabled_cpus __cpuinitdata; 66unsigned disabled_cpus __cpuinitdata;
67 67
68/* Bitmask of physically existing CPUs */
69physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
70
71#ifdef CONFIG_SMP 68#ifdef CONFIG_SMP
72u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata 69u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
73 = {[0 ... NR_CPUS - 1] = BAD_APICID }; 70 = {[0 ... NR_CPUS - 1] = BAD_APICID };
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7bcee1584b50..eee7768de2ae 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -88,12 +88,12 @@ void *x86_bios_cpu_apicid_early_ptr;
88unsigned int num_processors; 88unsigned int num_processors;
89unsigned disabled_cpus __cpuinitdata; 89unsigned disabled_cpus __cpuinitdata;
90 90
91/* Bitmask of physically existing CPUs */
92physid_mask_t phys_cpu_present_map;
93
94u8 apicid_2_node[MAX_APICID]; 91u8 apicid_2_node[MAX_APICID];
95#endif 92#endif
96 93
94/* Bitmask of physically existing CPUs */
95physid_mask_t phys_cpu_present_map;
96
97/* State of each CPU */ 97/* State of each CPU */
98DEFINE_PER_CPU(int, cpu_state) = { 0 }; 98DEFINE_PER_CPU(int, cpu_state) = { 0 };
99 99