summaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/smp.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-23 11:26:22 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-23 11:26:22 +0100
commit3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch)
treeceba46966a5a1112a05d257d8ecb25ae5eee95e0 /include/asm-parisc/smp.h
parent364f6c717deef4a3ac4982e670fa9846b43cd060 (diff)
parentee98689be1b054897ff17655008c3048fe88be94 (diff)
downloadtalos-op-linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.gz
talos-op-linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.zip
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-parisc/smp.h')
-rw-r--r--include/asm-parisc/smp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/smp.h b/include/asm-parisc/smp.h
index fde77ac35463..9413f67a540b 100644
--- a/include/asm-parisc/smp.h
+++ b/include/asm-parisc/smp.h
@@ -51,7 +51,7 @@ extern void smp_send_reschedule(int cpu);
extern unsigned long cpu_present_mask;
-#define smp_processor_id() (current_thread_info()->cpu)
+#define raw_smp_processor_id() (current_thread_info()->cpu)
#endif /* CONFIG_SMP */
OpenPOWER on IntegriCloud