hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Tejun Heo <tj@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Tejun Heo 2015-09-18 11:56:28 -04:00
parent 3014dde762
commit fa128fd735
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/linux/jump_label.h
View File

@ -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; \