Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d855432 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

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



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7abb3cca

arch/x86/kernel/mpparse_64.c

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ unsigned int num_processors; 


unsigned disabled_cpus __cpuinitdata;



/* Bitmask of physically existing CPUs */

physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;



#ifdef CONFIG_SMP

u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata

    = {[0 ... NR_CPUS - 1] = BAD_APICID };

arch/x86/kernel/smpboot.c

+3 −3
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ void *x86_bios_cpu_apicid_early_ptr; 
unsigned int num_processors;

unsigned disabled_cpus __cpuinitdata;



/* Bitmask of physically existing CPUs */

physid_mask_t phys_cpu_present_map;



u8 apicid_2_node[MAX_APICID];

#endif



/* Bitmask of physically existing CPUs */

physid_mask_t phys_cpu_present_map;



/* State of each CPU */

DEFINE_PER_CPU(int, cpu_state) = { 0 };