summaryrefslogtreecommitdiffstats
path: root/include/linux/marker.h
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2008-10-10 03:48:25 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:39:28 +0200
commitbfadadfccc19e36f7d600c5ce7b3e5ba5197fbf0 (patch)
tree6256ed176033a85150f3feb2858f18e37ced39f9 /include/linux/marker.h
parentca538f6bbe583406f941f3041d40c41f9a13d1de (diff)
markers: fix synchronize marker unregister static inline
Use a #define for synchronize marker unregister to fix include dependencies. Fixes the slab circular inclusion which triggers when slab.git is combined with tracing.git, where rcupdate includes slab, which includes markers which includes rcupdate. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/marker.h')
-rw-r--r--include/linux/marker.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/marker.h b/include/linux/marker.h
index 38e32e781ed..889196c7fbb 100644
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
@@ -13,7 +13,6 @@
*/
#include <linux/types.h>
-#include <linux/rcupdate.h>
struct module;
struct marker;
@@ -166,9 +165,6 @@ 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.
*/
-static inline void marker_synchronize_unregister(void)
-{
- synchronize_sched();
-}
+#define marker_synchronize_unregister() synchronize_sched()
#endif