lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: move phys_cpu_present_map to smpboot.c

Browse Source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy
2008-03-27 23:54:44 +03:00
committed by Ingo Molnar
parent 8f6e2ca9f8
commit 40014bace1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/mpparse_32.c
View File

@@ -70,8 +70,10 @@ unsigned int num_processors;
unsigned disabled_cpus __cpuinitdata; unsigned disabled_cpus __cpuinitdata;
/* Bitmask of physically existing CPUs */ /* Make it easy to share the UP and SMP code: */
#ifndef CONFIG_X86_SMP
physid_mask_t phys_cpu_present_map; physid_mask_t phys_cpu_present_map;
#endif
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID; DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;

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

@@ -85,6 +85,10 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
void *x86_bios_cpu_apicid_early_ptr; void *x86_bios_cpu_apicid_early_ptr;
DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID; DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid); EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
u8 apicid_2_node[MAX_APICID]; u8 apicid_2_node[MAX_APICID];
#endif #endif