diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 20:26:47 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 20:26:47 -0500 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /include/asm-alpha | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
| download | kernel-crypto-ea0daab4ae4a2f853f06c76961c0ed324fd0804c.tar.gz kernel-crypto-ea0daab4ae4a2f853f06c76961c0ed324fd0804c.tar.xz kernel-crypto-ea0daab4ae4a2f853f06c76961c0ed324fd0804c.zip | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-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 cbc173ae45a..9950706abdf 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]; #define PROC_CHANGE_PENALTY 20 #define hard_smp_processor_id() __hard_smp_processor_id() -#define smp_processor_id() (current_thread_info()->cpu) +#define raw_smp_processor_id() (current_thread_info()->cpu) extern cpumask_t cpu_present_mask; extern cpumask_t cpu_online_map; |