diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:18:26 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 20:06:53 +0400 |
commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/smp.h | |
parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
download | linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.xz |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
-rw-r--r-- | include/asm-x86/smp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index cd3c5f03fcaf..04f84f4e2c8b 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -34,6 +34,9 @@ extern cpumask_t cpu_initialized; DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); DECLARE_PER_CPU(cpumask_t, cpu_core_map); DECLARE_PER_CPU(u16, cpu_llc_id); +#ifdef CONFIG_X86_32 +DECLARE_PER_CPU(int, cpu_number); +#endif DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid); DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid); @@ -142,7 +145,6 @@ extern unsigned disabled_cpus __cpuinitdata; * from the initial startup. We map APIC_BASE very early in page_setup(), * so this is correct in the x86 case. */ -DECLARE_PER_CPU(int, cpu_number); #define raw_smp_processor_id() (x86_read_percpu(cpu_number)) extern int safe_smp_processor_id(void); |