summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/smp.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-22 21:50:57 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-22 21:50:57 -0400
commita5324343955997d1439f26518ddac567cd5d134b (patch)
treef43558389c41e3a0f076c4ee55d77c4aa1561779 /include/asm-ia64/smp.h
parent8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff)
parenta4936044001694f033fe4ea94d6034d51a6b465c (diff)
downloadblackbird-op-linux-a5324343955997d1439f26518ddac567cd5d134b.tar.gz
blackbird-op-linux-a5324343955997d1439f26518ddac567cd5d134b.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-ia64/smp.h')
-rw-r--r--include/asm-ia64/smp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index 3ba1a061e4ae..a3914352c995 100644
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -46,7 +46,7 @@ ia64_get_lid (void)
#define SMP_IRQ_REDIRECTION (1 << 0)
#define SMP_IPI_REDIRECTION (1 << 1)
-#define smp_processor_id() (current_thread_info()->cpu)
+#define raw_smp_processor_id() (current_thread_info()->cpu)
extern struct smp_boot_data {
int cpu_count;
OpenPOWER on IntegriCloud