From 9bcab1b1bdf413b291f2f4d3be5eb334cdf70f11 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Fri, 3 Oct 2008 11:52:54 -0400
Subject: [PATCH] --- yaml --- r: 116641 b: refs/heads/master c:
 53c8c8fdfd2d2d515bdcb3d0f2a11d1f3f42ece1 h: refs/heads/master i:   116639:
 e9579acdade2d8b44fa2fd956b4cdb99ef2f2972 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/marker.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 41c36fda767e..2b32451ff5a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed86a59071a4ccd0e9bcefc61e013759a21eda78
+refs/heads/master: 53c8c8fdfd2d2d515bdcb3d0f2a11d1f3f42ece1
diff --git a/trunk/include/linux/marker.h b/trunk/include/linux/marker.h
index 889196c7fbb1..38e32e781ed7 100644
--- a/trunk/include/linux/marker.h
+++ b/trunk/include/linux/marker.h
@@ -13,6 +13,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/rcupdate.h>
 
 struct module;
 struct marker;
@@ -165,6 +166,9 @@ extern void *marker_get_private_data(const char *name, marker_probe_func *probe,
  * unregistration and the end of module exit to make sure there is no caller
  * executing a probe when it is freed.
  */
-#define marker_synchronize_unregister() synchronize_sched()
+static inline void marker_synchronize_unregister(void)
+{
+	synchronize_sched();
+}
 
 #endif