diff --git a/[refs] b/[refs]
index 0fd1215f3bc5..6e2bcbce1fc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d911aed8adf74e1fae88d082b8474b2175b7f1da
+refs/heads/master: 1d4c452a85503cdb4bca5925cf698b61d3aa43a0
diff --git a/trunk/arch/parisc/kernel/irq.c b/trunk/arch/parisc/kernel/irq.c
index 3998c0cb925b..865611c15531 100644
--- a/trunk/arch/parisc/kernel/irq.c
+++ b/trunk/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/trunk/include/asm-parisc/smp.h b/trunk/include/asm-parisc/smp.h
index a5191950ce00..dbdbd2e9fdf9 100644
--- a/trunk/include/asm-parisc/smp.h
+++ b/trunk/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 */