summaryrefslogtreecommitdiff
path: root/kernel/jump_label.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2015-07-24 15:02:27 +0200
committerIngo Molnar <mingo@kernel.org>2015-08-03 11:34:14 +0200
commit7dcfd915bae51571bcc339d8e3dda027287880e5 (patch)
treefca6824ca88c535b73a56513a9df40e3a5f65f50 /kernel/jump_label.c
parenta1efb01feca597b2abbc89873b40ef8ec6690168 (diff)
downloadlinux-sh-7dcfd915bae51571bcc339d8e3dda027287880e5.tar.gz
jump_label: Add jump_entry_key() helper
Avoid some casting with a helper, also prepares the way for overloading the LSB of jump_entry::key. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/jump_label.c')
-rw-r--r--kernel/jump_label.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 85a2a0086c67..72707e44c44d 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -188,6 +188,11 @@ static inline struct jump_entry *static_key_entries(struct static_key *key)
return (struct jump_entry *)((unsigned long)key->entries & ~JUMP_TYPE_MASK);
}
+static inline struct static_key *jump_entry_key(struct jump_entry *entry)
+{
+ return (struct static_key *)((unsigned long)entry->key);
+}
+
static enum jump_label_type jump_label_type(struct static_key *key)
{
bool enabled = static_key_enabled(key);
@@ -209,7 +214,7 @@ void __init jump_label_init(void)
for (iter = iter_start; iter < iter_stop; iter++) {
struct static_key *iterk;
- iterk = (struct static_key *)(unsigned long)iter->key;
+ iterk = jump_entry_key(iter);
arch_jump_label_transform_static(iter, jump_label_type(iterk));
if (iterk == key)
continue;
@@ -304,7 +309,7 @@ static int jump_label_add_module(struct module *mod)
for (iter = iter_start; iter < iter_stop; iter++) {
struct static_key *iterk;
- iterk = (struct static_key *)(unsigned long)iter->key;
+ iterk = jump_entry_key(iter);
if (iterk == key)
continue;
@@ -341,10 +346,10 @@ static void jump_label_del_module(struct module *mod)
struct static_key_mod *jlm, **prev;
for (iter = iter_start; iter < iter_stop; iter++) {
- if (iter->key == (jump_label_t)(unsigned long)key)
+ if (jump_entry_key(iter) == key)
continue;
- key = (struct static_key *)(unsigned long)iter->key;
+ key = jump_entry_key(iter);
if (within_module(iter->key, mod))
continue;