Skip to content

Commit

Permalink
markers: fix synchronize marker unregister static inline
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mathieu Desnoyers authored and Ingo Molnar committed Oct 14, 2008
1 parent ca538f6 commit bfadadf
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions include/linux/marker.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/

#include <linux/types.h>
#include <linux/rcupdate.h>

struct module;
struct marker;
Expand Down Expand Up @@ -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

0 comments on commit bfadadf

Please sign in to comment.