mirror of https://gitee.com/openkylin/linux.git
x86: move phys_cpu_present_map to setup.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
76eb41319d
commit
0fc0906e59
|
@ -69,11 +69,6 @@ unsigned int boot_cpu_physical_apicid = -1U;
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/* Make it easy to share the UP and SMP code: */
|
||||
#ifndef CONFIG_X86_SMP
|
||||
physid_mask_t phys_cpu_present_map;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Intel MP BIOS table parsing routines:
|
||||
*/
|
||||
|
|
|
@ -70,11 +70,6 @@ unsigned int boot_cpu_physical_apicid = -1U;
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/* Make it easy to share the UP and SMP code: */
|
||||
#ifndef CONFIG_X86_SMP
|
||||
physid_mask_t phys_cpu_present_map;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Intel MP BIOS table parsing routines:
|
||||
*/
|
||||
|
|
|
@ -9,11 +9,15 @@
|
|||
#include <asm/processor.h>
|
||||
#include <asm/setup.h>
|
||||
#include <asm/topology.h>
|
||||
#include <asm/mpspec.h>
|
||||
#include <asm/apicdef.h>
|
||||
|
||||
DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;
|
||||
EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
|
||||
|
||||
/* Bitmask of physically existing CPUs */
|
||||
physid_mask_t phys_cpu_present_map;
|
||||
|
||||
#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)
|
||||
/*
|
||||
* Copy data used in early init routines from the initial arrays to the
|
||||
|
|
|
@ -88,9 +88,6 @@ u8 apicid_2_node[MAX_APICID];
|
|||
/* Internal processor count */
|
||||
unsigned int num_processors;
|
||||
|
||||
/* Bitmask of physically existing CPUs */
|
||||
physid_mask_t phys_cpu_present_map;
|
||||
|
||||
/* State of each CPU */
|
||||
DEFINE_PER_CPU(int, cpu_state) = { 0 };
|
||||
|
||||
|
|
Loading…
Reference in New Issue