lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 13 Oct 2013 22:50:27 +0800 From: Jiang Liu <liuj97@...il.com> To: Steven Rostedt <rostedt@...dmis.org>, Catalin Marinas <catalin.marinas@....com>, Will Deacon <will.deacon@....com>, Sandeepa Prabhu <sandeepa.prabhu@...aro.org>, Jiang Liu <jiang.liu@...wei.com>, Andrew Jones <drjones@...hat.com>, Raghavendra K T <raghavendra.kt@...ux.vnet.ibm.com>, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, "H. Peter Anvin" <hpa@...ux.intel.com>, linux-kernel@...r.kernel.org Cc: linux-arm-kernel@...ts.infradead.org, Jiang Liu <liuj97@...il.com> Subject: [PATCH v2 7/7] jump_label: use defined macros instead of hard-coding for better readability From: Jiang Liu <jiang.liu@...wei.com> Use macro JUMP_LABEL_TRUE_BRANCH instead of hard-coding for better readability. Signed-off-by: Jiang Liu <jiang.liu@...wei.com> Cc: Jiang Liu <liuj97@...il.com> --- include/linux/jump_label.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index a507907..6e54029 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -74,18 +74,21 @@ struct module; #include <linux/atomic.h> #ifdef HAVE_JUMP_LABEL -#define JUMP_LABEL_TRUE_BRANCH 1UL +#define JUMP_LABEL_TYPE_FALSE_BRANCH 0UL +#define JUMP_LABEL_TYPE_TRUE_BRANCH 1UL +#define JUMP_LABEL_TYPE_MASK 1UL static inline struct jump_entry *jump_label_get_entries(struct static_key *key) { return (struct jump_entry *)((unsigned long)key->entries - & ~JUMP_LABEL_TRUE_BRANCH); + & ~JUMP_LABEL_TYPE_MASK); } static inline bool jump_label_get_branch_default(struct static_key *key) { - if ((unsigned long)key->entries & JUMP_LABEL_TRUE_BRANCH) + if (((unsigned long)key->entries & JUMP_LABEL_TYPE_MASK) == + JUMP_LABEL_TYPE_TRUE_BRANCH) return true; return false; } @@ -116,9 +119,11 @@ extern void static_key_slow_dec(struct static_key *key); extern void jump_label_apply_nops(struct module *mod); #define STATIC_KEY_INIT_TRUE ((struct static_key) \ - { .enabled = ATOMIC_INIT(1), .entries = (void *)1 }) + { .enabled = ATOMIC_INIT(1), \ + .entries = (void *)JUMP_LABEL_TYPE_TRUE_BRANCH }) #define STATIC_KEY_INIT_FALSE ((struct static_key) \ - { .enabled = ATOMIC_INIT(0), .entries = (void *)0 }) + { .enabled = ATOMIC_INIT(0), \ + .entries = (void *)JUMP_LABEL_TYPE_FALSE_BRANCH }) #else /* !HAVE_JUMP_LABEL */ -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists