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

Commit 7b8cbd2c authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

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



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

arch/x86/kernel/mpparse_64.c

+0 −3
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/smpboot.c

+3 −2
Original line number Diff line number Diff line
@@ -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;