diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /include/asm-alpha | |
| 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-alpha')
| -rw-r--r-- | include/asm-alpha/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index cbc173ae45aa..9950706abdf8 100644 --- a/include/asm-alpha/smp.h +++ b/include/asm-alpha/smp.h | |||
| @@ -43,7 +43,7 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS]; | |||
| 43 | #define PROC_CHANGE_PENALTY 20 | 43 | #define PROC_CHANGE_PENALTY 20 |
| 44 | 44 | ||
| 45 | #define hard_smp_processor_id() __hard_smp_processor_id() | 45 | #define hard_smp_processor_id() __hard_smp_processor_id() |
| 46 | #define smp_processor_id() (current_thread_info()->cpu) | 46 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
| 47 | 47 | ||
| 48 | extern cpumask_t cpu_present_mask; | 48 | extern cpumask_t cpu_present_mask; |
| 49 | extern cpumask_t cpu_online_map; | 49 | extern cpumask_t cpu_online_map; |