diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2015-07-24 15:02:27 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-05-22 23:15:04 +0100 |
| commit | 9e54b139e7db52329241328e5aea4b8218d89040 (patch) | |
| tree | 455da4944d6ffcfddc76fb29b95f436c3e513da6 | |
| parent | d4e9d092ce3355aaad3e44a0fe0ecd4a57d31a36 (diff) | |
| download | linux-stable-9e54b139e7db52329241328e5aea4b8218d89040.tar.gz linux-stable-9e54b139e7db52329241328e5aea4b8218d89040.tar.bz2 linux-stable-9e54b139e7db52329241328e5aea4b8218d89040.zip | |
jump_label: Add jump_entry_key() helper
commit 7dcfd915bae51571bcc339d8e3dda027287880e5 upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | kernel/jump_label.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index 2b0ac45241da..7c32d9e13a15 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -195,6 +195,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); @@ -216,7 +221,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; @@ -311,7 +316,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; @@ -348,10 +353,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; |