diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 12:19:24 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 12:19:24 +0200 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /include/asm-i386/smp.h | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-i386/smp.h')
| -rw-r--r-- | include/asm-i386/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index e03a206dfa3..55ef31f66bb 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h @@ -51,7 +51,7 @@ extern u8 x86_cpu_to_apicid[]; * from the initial startup. We map APIC_BASE very early in page_setup(), * so this is correct in the x86 case. */ -#define __smp_processor_id() (current_thread_info()->cpu) +#define raw_smp_processor_id() (current_thread_info()->cpu) extern cpumask_t cpu_callout_map; extern cpumask_t cpu_callin_map; |