diff --git a/[refs] b/[refs]
index cade12b72d39..f1cae1cc35c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ff28e22bdb8727fbc7d7889807bc5a73aae56c5
+refs/heads/master: 3c30b06df404c8892c225a99ecfd3f02789c0513
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index d699a16b0cb2..e2fa3ab4afc5 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -82,7 +82,11 @@ void smp_prepare_boot_cpu(void);
  */
 #define raw_smp_processor_id()			0
 #define hard_smp_processor_id()			0
-#define smp_call_function(func,info,retry,wait)	({ 0; })
+static inline int up_smp_call_function(void)
+{
+	return 0;
+}
+#define smp_call_function(func,info,retry,wait)	(up_smp_call_function())
 #define on_each_cpu(func,info,retry,wait)	\
 	({					\
 		local_irq_disable();		\