projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
[powerpc.git]
/
include
/
asm-ia64
/
smp.h
diff --git
a/include/asm-ia64/smp.h
b/include/asm-ia64/smp.h
index
3ba1a06
..
a391435
100644
(file)
--- 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;