aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-11-17 16:27:44 -0500
committerKyle McMartin <kyle@parisc-linux.org>2005-11-17 16:27:44 -0500
commit1d4c452a85503cdb4bca5925cf698b61d3aa43a0 (patch)
treecd2c786aa4dbab46d4aa394ffdaa8cd52387d894
parentd911aed8adf74e1fae88d082b8474b2175b7f1da (diff)
[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>
-rw-r--r--arch/parisc/kernel/irq.c2
-rw-r--r--include/asm-parisc/smp.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 3998c0cb925..865611c1553 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 a5191950ce0..dbdbd2e9fdf 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 */