openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: move x86_cpu_to_apicid_init to smpboot.c 

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy 2008-04-04 23:40:54 +04:00 committed by Ingo Molnar
parent 0fc0906e59
commit 708650afe9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/genapic_64.c
View File

@ -25,12 +25,6 @@
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#endif #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); DEFINE_PER_CPU(int, x2apic_extra_bits);
struct genapic __read_mostly *genapic = &apic_flat; struct genapic __read_mostly *genapic = &apic_flat;

3
arch/x86/kernel/smpboot.c
View File

@ -72,12 +72,13 @@
* integrate apic between arches, we can probably do a better job, but * integrate apic between arches, we can probably do a better job, but
* right now, they'll stay here -- glommer * right now, they'll stay here -- glommer
*/ */
#ifdef CONFIG_X86_32
/* which logical CPU number maps to which CPU (physical APIC ID) */ /* which logical CPU number maps to which CPU (physical APIC ID) */
u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata = u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
{ [0 ... NR_CPUS-1] = BAD_APICID }; { [0 ... NR_CPUS-1] = BAD_APICID };
void *x86_cpu_to_apicid_early_ptr; void *x86_cpu_to_apicid_early_ptr;
#ifdef CONFIG_X86_32
u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
= { [0 ... NR_CPUS-1] = BAD_APICID }; = { [0 ... NR_CPUS-1] = BAD_APICID };
void *x86_bios_cpu_apicid_early_ptr; void *x86_bios_cpu_apicid_early_ptr;