diff options
-rw-r--r-- | arch/x86/kernel/mpparse_64.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/smpboot.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index 8e8e38f2b182..71f098414d0b 100644 --- a/arch/x86/kernel/mpparse_64.c +++ b/arch/x86/kernel/mpparse_64.c | |||
@@ -60,9 +60,6 @@ int nr_ioapics; | |||
60 | unsigned int boot_cpu_physical_apicid = -1U; | 60 | unsigned int boot_cpu_physical_apicid = -1U; |
61 | EXPORT_SYMBOL(boot_cpu_physical_apicid); | 61 | EXPORT_SYMBOL(boot_cpu_physical_apicid); |
62 | 62 | ||
63 | /* Internal processor count */ | ||
64 | unsigned int num_processors; | ||
65 | |||
66 | unsigned disabled_cpus __cpuinitdata; | 63 | unsigned disabled_cpus __cpuinitdata; |
67 | 64 | ||
68 | #ifdef CONFIG_SMP | 65 | #ifdef CONFIG_SMP |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index eee7768de2ae..fd0bdd36f4ea 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -84,13 +84,14 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata | |||
84 | = { [0 ... NR_CPUS-1] = BAD_APICID }; | 84 | = { [0 ... NR_CPUS-1] = BAD_APICID }; |
85 | void *x86_bios_cpu_apicid_early_ptr; | 85 | void *x86_bios_cpu_apicid_early_ptr; |
86 | 86 | ||
87 | /* Internal processor count */ | ||
88 | unsigned int num_processors; | ||
89 | unsigned disabled_cpus __cpuinitdata; | 87 | unsigned disabled_cpus __cpuinitdata; |
90 | 88 | ||
91 | u8 apicid_2_node[MAX_APICID]; | 89 | u8 apicid_2_node[MAX_APICID]; |
92 | #endif | 90 | #endif |
93 | 91 | ||
92 | /* Internal processor count */ | ||
93 | unsigned int num_processors; | ||
94 | |||
94 | /* Bitmask of physically existing CPUs */ | 95 | /* Bitmask of physically existing CPUs */ |
95 | physid_mask_t phys_cpu_present_map; | 96 | physid_mask_t phys_cpu_present_map; |
96 | 97 | ||