diff --git a/[refs] b/[refs]
index 1e3bdc5ed94a..d79b4d57e5a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8317f14b60c02c69cf7f594e2aabc8a3fdc9618d
+refs/heads/master: 79974a0e4c6be6e9a3717b4c5a5d5c44c36b1653
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index 3f70149eabbb..96ac21f8dd73 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -6,6 +6,7 @@
  *		Alan Cox. <alan@redhat.com>
  */
 
+#include <linux/errno.h>
 
 extern void cpu_idle(void);
 
@@ -99,11 +100,9 @@ static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()			1
 #define smp_prepare_boot_cpu()			do {} while (0)
 static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
-				void *info, int retry, int wait)
+					   void *info, int retry, int wait)
 {
-	/* Disable interrupts here? */
-	func(info);
-	return 0;
+	return -EBUSY;
 }
 
 #endif /* !SMP */