diff options
Diffstat (limited to 'include/linux/tracepoint.h')
| -rw-r--r-- | include/linux/tracepoint.h | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index fc36da97ff7..bd96ecd0e05 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -17,7 +17,7 @@  #include <linux/errno.h>  #include <linux/types.h>  #include <linux/rcupdate.h> -#include <linux/jump_label.h> +#include <linux/static_key.h>  struct module;  struct tracepoint; @@ -29,7 +29,7 @@ struct tracepoint_func {  struct tracepoint {  	const char *name;		/* Tracepoint name */ -	struct jump_label_key key; +	struct static_key key;  	void (*regfunc)(void);  	void (*unregfunc)(void);  	struct tracepoint_func __rcu *funcs; @@ -145,7 +145,7 @@ static inline void tracepoint_synchronize_unregister(void)  	extern struct tracepoint __tracepoint_##name;			\  	static inline void trace_##name(proto)				\  	{								\ -		if (static_branch(&__tracepoint_##name.key))		\ +		if (static_key_false(&__tracepoint_##name.key))		\  			__DO_TRACE(&__tracepoint_##name,		\  				TP_PROTO(data_proto),			\  				TP_ARGS(data_args),			\ @@ -188,7 +188,7 @@ static inline void tracepoint_synchronize_unregister(void)  	__attribute__((section("__tracepoints_strings"))) = #name;	 \  	struct tracepoint __tracepoint_##name				 \  	__attribute__((section("__tracepoints"))) =			 \ -		{ __tpstrtab_##name, JUMP_LABEL_INIT, reg, unreg, NULL };\ +		{ __tpstrtab_##name, STATIC_KEY_INIT_FALSE, reg, unreg, NULL };\  	static struct tracepoint * const __tracepoint_ptr_##name __used	 \  	__attribute__((section("__tracepoints_ptrs"))) =		 \  		&__tracepoint_##name;  |