x86: move num_processors to smpboot.c (64 bit)
authorAlexey Starikovskiy <astarikovskiy@suse.de>
Thu, 27 Mar 2008 20:55:59 +0000 (23:55 +0300)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:32 +0000 (17:41 +0200)
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/mpparse_64.c
arch/x86/kernel/smpboot.c

index 8e8e38f2b182f08489cfab0e45c0e990187a5515..71f098414d0b492c7321387f7dfa526d67103570 100644 (file)
@@ -60,9 +60,6 @@ int nr_ioapics;
 unsigned int boot_cpu_physical_apicid = -1U;
 EXPORT_SYMBOL(boot_cpu_physical_apicid);
 
-/* Internal processor count */
-unsigned int num_processors;
-
 unsigned disabled_cpus __cpuinitdata;
 
 #ifdef CONFIG_SMP
index eee7768de2ae54a041c7c26d0460f2d592278144..fd0bdd36f4ea676d4bbafc0cb378cc38beebb4c8 100644 (file)
@@ -84,13 +84,14 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
                                = { [0 ... NR_CPUS-1] = BAD_APICID };
 void *x86_bios_cpu_apicid_early_ptr;
 
-/* Internal processor count */
-unsigned int num_processors;
 unsigned disabled_cpus __cpuinitdata;
 
 u8 apicid_2_node[MAX_APICID];
 #endif
 
+/* Internal processor count */
+unsigned int num_processors;
+
 /* Bitmask of physically existing CPUs */
 physid_mask_t phys_cpu_present_map;