Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 05:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

jump_label: Add jump_entry_key() helper

Browse Source 
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>
This commit is contained in:
Peter Zijlstra 2015-07-24 15:02:27 +02:00 committed by Ingo Molnar
parent a1efb01fec
commit 7dcfd915ba
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/jump_label.c
View File

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