Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

x86: move x86_bios_cpu_apicid_init to smpboot.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Alexey Starikovskiy 17 years ago
parent
708650afe9
commit
16ecf7a47c
2 changed files with 1 additions and 7 deletions
Unified View Show Diff Stats
  1. 0 6
      arch/x86/kernel/mpparse_64.c
  2. 1 1
      arch/x86/kernel/smpboot.c

+ 0 - 6
arch/x86/kernel/mpparse_64.c
View File 

@@ -55,12 +55,6 @@ int mp_irq_entries;
 
 
 
 int nr_ioapics;
 
 int nr_ioapics;
 
 
 
-#ifdef CONFIG_SMP
 
-u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
 
-    = {[0 ... NR_CPUS - 1] = BAD_APICID };
 
-void *x86_bios_cpu_apicid_early_ptr;
 
-#endif
 
-
 
 /* Make it easy to share the UP and SMP code: */
 
 /* Make it easy to share the UP and SMP code: */
 
 #ifndef CONFIG_X86_SMP
 
 #ifndef CONFIG_X86_SMP
 
 unsigned int num_processors;
 
 unsigned int num_processors;

+ 1 - 1
arch/x86/kernel/smpboot.c
View File 

@@ -78,11 +78,11 @@ u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
 
 			{ [0 ... NR_CPUS-1] = BAD_APICID };
 
 			{ [0 ... NR_CPUS-1] = BAD_APICID };
 
 void *x86_cpu_to_apicid_early_ptr;
 
 void *x86_cpu_to_apicid_early_ptr;
 
 
 
-#ifdef CONFIG_X86_32
 
 u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
 
 u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
 
 				= { [0 ... NR_CPUS-1] = BAD_APICID };
 
 				= { [0 ... NR_CPUS-1] = BAD_APICID };
 
 void *x86_bios_cpu_apicid_early_ptr;
 
 void *x86_bios_cpu_apicid_early_ptr;
 
 
 
+#ifdef CONFIG_X86_32
 
 u8 apicid_2_node[MAX_APICID];
 
 u8 apicid_2_node[MAX_APICID];
 
 #endif
 
 #endif