From: Kyle McMartin <kyle@parisc-linux.org>
Date: Thu, 17 Nov 2005 21:27:44 +0000 (-0500)
Subject: [PARISC] Fix uniprocessor build by dummying smp_send_all_nop()
X-Git-Tag: v2.6.15-rc2~16^2~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d4c452a85503cdb4bca5925cf698b61d3aa43a0;p=linux-2.6

[PARISC] Fix uniprocessor build by dummying smp_send_all_nop()

Since irq.c uses smp_send_all_nop, we must define it for UP builds
as well. Make it a static inline so it gets optimized away. This forces
irq.c to include <asm/smp.h> though.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 3998c0cb92..865611c155 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -31,6 +31,8 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
+#include <asm/smp.h>
+
 #undef PARISC_IRQ_CR16_COUNTS
 
 extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *);
diff --git a/include/asm-parisc/smp.h b/include/asm-parisc/smp.h
index a5191950ce..dbdbd2e9fd 100644
--- a/include/asm-parisc/smp.h
+++ b/include/asm-parisc/smp.h
@@ -54,7 +54,11 @@ extern unsigned long cpu_present_mask;
 
 #define raw_smp_processor_id()	(current_thread_info()->cpu)
 
-#endif /* CONFIG_SMP */
+#else /* CONFIG_SMP */
+
+static inline void smp_send_all_nop(void) { return; }
+
+#endif
 
 #define NO_PROC_ID		0xFF		/* No processor magic marker */
 #define ANY_PROC_ID		0xFF		/* Any processor magic marker */