diff --git a/[refs] b/[refs] index 50a5221366a7..ac1ebd365b27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca538f6bbe583406f941f3041d40c41f9a13d1de +refs/heads/master: bfadadfccc19e36f7d600c5ce7b3e5ba5197fbf0 diff --git a/trunk/include/linux/marker.h b/trunk/include/linux/marker.h index 38e32e781ed7..889196c7fbb1 100644 --- a/trunk/include/linux/marker.h +++ b/trunk/include/linux/marker.h @@ -13,7 +13,6 @@ */ #include -#include 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