Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa128fd7 authored by Tejun Heo's avatar Tejun Heo
Browse files

jump_label: make static_key_enabled() work on static_key_true/false types too 



static_key_enabled() can be used on struct static_key but not on its
wrapper types static_key_true and static_key_false.  The function is
useful for debugging and management of static keys.  Update it so that
it can be used for the wrapper types too.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
parent 3014dde7

include/linux/jump_label.h

+11 −7
Original line number Original line Diff line number Diff line
@@ -216,11 +216,6 @@ static inline int jump_label_apply_nops(struct module *mod) 
#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE

#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE

#define jump_label_enabled static_key_enabled

#define jump_label_enabled static_key_enabled





static inline bool static_key_enabled(struct static_key *key)

{

	return static_key_count(key) > 0;

}



static inline void static_key_enable(struct static_key *key)

static inline void static_key_enable(struct static_key *key)

{

{

	int count = static_key_count(key);

	int count = static_key_count(key);
@@ -267,6 +262,17 @@ struct static_key_false { 
#define DEFINE_STATIC_KEY_FALSE(name)	\

#define DEFINE_STATIC_KEY_FALSE(name)	\

	struct static_key_false name = STATIC_KEY_FALSE_INIT

	struct static_key_false name = STATIC_KEY_FALSE_INIT





extern bool ____wrong_branch_error(void);



#define static_key_enabled(x)							\

({										\

	if (!__builtin_types_compatible_p(typeof(*x), struct static_key) &&	\

	    !__builtin_types_compatible_p(typeof(*x), struct static_key_true) &&\

	    !__builtin_types_compatible_p(typeof(*x), struct static_key_false))	\

		____wrong_branch_error();					\

	static_key_count((struct static_key *)x) > 0;				\

})



#ifdef HAVE_JUMP_LABEL

#ifdef HAVE_JUMP_LABEL





/*

/*
@@ -325,8 +331,6 @@ struct static_key_false { 
 * See jump_label_type() / jump_label_init_type().

 * See jump_label_type() / jump_label_init_type().

 */

 */





extern bool ____wrong_branch_error(void);



#define static_branch_likely(x)							\

#define static_branch_likely(x)							\

({										\

({										\

	bool branch;								\

	bool branch;								\