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-mips/smp.h | |
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-mips/smp.h')
-rw-r--r-- | include/asm-mips/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/smp.h b/include/asm-mips/smp.h index 8ba370ecfd4..5618f1e12f4 100644 --- a/include/asm-mips/smp.h +++ b/include/asm-mips/smp.h @@ -21,7 +21,7 @@ #include <linux/cpumask.h> #include <asm/atomic.h> -#define smp_processor_id() (current_thread_info()->cpu) +#define raw_smp_processor_id() (current_thread_info()->cpu) /* Map from cpu id to sequential logical cpu number. This will only not be idempotent when cpus failed to come on-line. */ |