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

Commit 708650af authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

x86: move x86_cpu_to_apicid_init to smpboot.c 



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

arch/x86/kernel/genapic_64.c

+0 −6
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ 
#include <acpi/acpi_bus.h>

#endif



/* which logical CPU number maps to which CPU (physical APIC ID) */

#ifdef CONFIG_SMP

u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata

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

void *x86_cpu_to_apicid_early_ptr;

#endif

DEFINE_PER_CPU(int, x2apic_extra_bits);



struct genapic __read_mostly *genapic = &apic_flat;

arch/x86/kernel/smpboot.c

+2 −1
Original line number Diff line number Diff line
@@ -72,12 +72,13 @@ 
 * integrate apic between arches, we can probably do a better job, but

 * right now, they'll stay here -- glommer

 */

#ifdef CONFIG_X86_32



/* which logical CPU number maps to which CPU (physical APIC ID) */

u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =

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

void *x86_cpu_to_apicid_early_ptr;



#ifdef CONFIG_X86_32

u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata

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

void *x86_bios_cpu_apicid_early_ptr;