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