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

Commit 16ecf7a4 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

x86: move x86_bios_cpu_apicid_init to smpboot.c 



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

arch/x86/kernel/mpparse_64.c

+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ int mp_irq_entries; 


int nr_ioapics;



#ifdef CONFIG_SMP

u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata

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

void *x86_bios_cpu_apicid_early_ptr;

#endif



/* Make it easy to share the UP and SMP code: */

#ifndef CONFIG_X86_SMP

unsigned int num_processors;

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -78,11 +78,11 @@ 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;



#ifdef CONFIG_X86_32

u8 apicid_2_node[MAX_APICID];

#endif