Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / include / asm-parisc / smp.h

diff --git a/include/asm-parisc/smp.h b/include/asm-parisc/smp.h
index a5191950ce007c5aeb9b8755470dbb6a84b41517..dbdbd2e9fdf9304e658a6ea61a56cdf8c6688e67 100644 (file)
--- 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 */