diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-27 14:06:02 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:32 +0200 |
| commit | a9c057c1d1b1080a01004ecac54308365e167b83 (patch) | |
| tree | a14daf277587a231e6c4c08304abb29b1b365d49 /include/asm-x86/smp_32.h | |
| parent | 24e8ecffa84dd560e0d4d6fcaeca6950805854e7 (diff) | |
| download | talos-op-linux-a9c057c1d1b1080a01004ecac54308365e167b83.tar.gz talos-op-linux-a9c057c1d1b1080a01004ecac54308365e167b83.zip | |
x86: merge SMP definitions of smp.h
we merge everything that is inside CONFIG_SMP
to smp.h. They differ a little bit, so we use
CONFIG_X86_32_SMP and CONFIG_X86_64_SMP as markers.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp_32.h')
| -rw-r--r-- | include/asm-x86/smp_32.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h index 694d3245a88f..d9ae5ac93dfc 100644 --- a/include/asm-x86/smp_32.h +++ b/include/asm-x86/smp_32.h @@ -8,26 +8,5 @@ extern cpumask_t cpu_callin_map; extern void (*mtrr_hook)(void); extern void zap_low_mappings(void); -#ifdef CONFIG_SMP -/* - * This function is needed by all SMP systems. It must _always_ be valid - * 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); - -/* We don't mark CPUs online until __cpu_up(), so we need another measure */ -static inline int num_booting_cpus(void) -{ - return cpus_weight(cpu_callout_map); -} - -#else /* CONFIG_SMP */ -#define safe_smp_processor_id() 0 -#endif /* !CONFIG_SMP */ - #endif /* !ASSEMBLY */ #endif |
