diff --git a/[refs] b/[refs]
index 4196c0df5ea5..8ad664d4b104 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a1e9693f534174945154197fec4ec92f168ce21
+refs/heads/master: e98d0eabef2748d88fa58760d104e8e68517406b
diff --git a/trunk/include/linux/marker.h b/trunk/include/linux/marker.h
index 1290653f9241..889196c7fbb1 100644
--- a/trunk/include/linux/marker.h
+++ b/trunk/include/linux/marker.h
@@ -160,4 +160,11 @@ extern int marker_probe_unregister_private_data(marker_probe_func *probe,
 extern void *marker_get_private_data(const char *name, marker_probe_func *probe,
 	int num);
 
+/*
+ * marker_synchronize_unregister must be called between the last marker 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()
+
 #endif