diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2004-06-28 22:57:11 -0700 |
|---|---|---|
| committer | David Mosberger <davidm@tiger.hpl.hp.com> | 2004-06-28 22:57:11 -0700 |
| commit | 3ade83bef378f485816e251ba3f937ea3c2c596c (patch) | |
| tree | 4dc3cba6a7f8b824d2263989d323ac513242fe4c /include | |
| parent | 8ca942935efd6c6d7cecc99eb14c3bf832e379c7 (diff) | |
[PATCH] ia64: define cpu_logical_id() always
Define cpu_logical_id() even when !SMP. I added uses of this in some
iosapic printk's, which broke the UP build.
Signed-off-by: David Mosberger <davidm@hpl.hp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/smp.h | 4 | ||||
| -rw-r--r-- | include/asm-ia64/sn/sn_cpuid.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h index f12f939e3c00..513c704d1306 100644 --- a/include/asm-ia64/smp.h +++ b/include/asm-ia64/smp.h @@ -123,5 +123,9 @@ extern void smp_send_reschedule (int cpu); extern void lock_ipi_calllock(void); extern void unlock_ipi_calllock(void); +#else + +#define cpu_logical_id(cpuid) 0 + #endif /* CONFIG_SMP */ #endif /* _ASM_IA64_SMP_H */ diff --git a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h index 0c7cce652368..6f1128f1e895 100644 --- a/include/asm-ia64/sn/sn_cpuid.h +++ b/include/asm-ia64/sn/sn_cpuid.h @@ -84,7 +84,6 @@ */ #ifndef CONFIG_SMP -#define cpu_logical_id(cpu) 0 #define cpu_physical_id(cpuid) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff) #endif |