iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: move phys_cpu_present_map to smpboot.c (64bit)

Browse Source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy 2008-03-27 23:55:53 +03:00 committed by Ingo Molnar
parent 7abb3cca33
commit 1d85543265
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/mpparse_64.c
View File

@ -65,9 +65,6 @@ unsigned int num_processors;
unsigned disabled_cpus __cpuinitdata; unsigned disabled_cpus __cpuinitdata;
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
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 };

6
arch/x86/kernel/smpboot.c
View File

@ -88,12 +88,12 @@ void *x86_bios_cpu_apicid_early_ptr;
unsigned int num_processors; unsigned int num_processors;
unsigned disabled_cpus __cpuinitdata; unsigned disabled_cpus __cpuinitdata;
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
u8 apicid_2_node[MAX_APICID]; u8 apicid_2_node[MAX_APICID];
#endif #endif
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
/* State of each CPU */ /* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 }; DEFINE_PER_CPU(int, cpu_state) = { 0 };