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

Commit 3103623e authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

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



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

arch/x86/kernel/mpparse_64.c

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ int nr_ioapics; 
unsigned int boot_cpu_physical_apicid = -1U;

EXPORT_SYMBOL(boot_cpu_physical_apicid);



unsigned disabled_cpus __cpuinitdata;



#ifdef CONFIG_SMP

u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata

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

arch/x86/kernel/smpboot.c

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata 
				= { [0 ... NR_CPUS-1] = BAD_APICID };

void *x86_bios_cpu_apicid_early_ptr;



unsigned disabled_cpus __cpuinitdata;



u8 apicid_2_node[MAX_APICID];

#endif
@@ -98,6 +96,8 @@ physid_mask_t phys_cpu_present_map; 
/* State of each CPU */

DEFINE_PER_CPU(int, cpu_state) = { 0 };



unsigned disabled_cpus __cpuinitdata;



/* Store all idle threads, this can be reused instead of creating

* a new thread. Also avoids complicated thread destroy functionality

* for idle threads.