[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>

diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index f12f939e3c00502e0b1536cc2c0679b1808be988..513c704d1306eb6b07f02bc0f6fbefceba9a8a26 100644 (file)
--- 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 0c7cce652368780e66003eace7a7b412a20cca5a..6f1128f1e895eb9b40f41a321869538fe5deb47c 100644 (file)
--- 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