diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 19:10:49 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 19:10:49 +0200 |
| commit | 80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch) | |
| tree | b3a36048d6b7de88f7e906624ecb4b98816bb736 /include/asm-ia64/smp.h | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds... (diff) | |
| parent | Merge rsync://oss.sgi.com/git/xfs-2.6 (diff) | |
| download | linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.tar.xz linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-ia64/smp.h')
| -rw-r--r-- | include/asm-ia64/smp.h | 2 |
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; |