diff --git a/[refs] b/[refs]
index 5f73e1b8857d..296d312bfbbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2461fc82a083dd60062e05e704c5fcc1c658ba1
+refs/heads/master: 231375cc5cc3549bb413f94a164bdcbd5f9ce943
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
index 199f4c207c1e..c5bb39c7a770 100644
--- a/trunk/include/linux/tracepoint.h
+++ b/trunk/include/linux/tracepoint.h
@@ -129,6 +129,9 @@ extern int tracepoint_get_iter_range(struct tracepoint **tracepoint,
  * probe unregistration and the end of module exit to make sure there is no
  * caller executing a probe when it is freed.
  */
-#define tracepoint_synchronize_unregister() synchronize_sched()
+static inline void tracepoint_synchronize_unregister(void)
+{
+	synchronize_sched();
+}
 
 #endif