Jelajahi Sumber

x86: move disabled_cpus to smpboot.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Alexey Starikovskiy 17 tahun lalu
induk
melakukan
53c4c793b3
2 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 1 2
      arch/x86/kernel/mpparse_32.c
  2. 1 0
      arch/x86/kernel/smpboot.c

+ 1 - 2
arch/x86/kernel/mpparse_32.c

@@ -69,9 +69,8 @@ unsigned int boot_cpu_physical_apicid = -1U;
 /* Make it easy to share the UP and SMP code: */
 #ifndef CONFIG_X86_SMP
 unsigned int num_processors;
-#endif
-
 unsigned disabled_cpus __cpuinitdata;
+#endif
 
 /* Make it easy to share the UP and SMP code: */
 #ifndef CONFIG_X86_SMP

+ 1 - 0
arch/x86/kernel/smpboot.c

@@ -88,6 +88,7 @@ EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
 
 /* Internal processor count */
 unsigned int num_processors;
+unsigned disabled_cpus __cpuinitdata;
 
 /* Bitmask of physically existing CPUs */
 physid_mask_t phys_cpu_present_map;