projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs: block_dev.c: fix kernel-doc warnings from struct block_device changes
[linux-2.6-microblaze.git]
/
kernel
/
jump_label.c
diff --git
a/kernel/jump_label.c
b/kernel/jump_label.c
index
015ef90
..
c6a39d6
100644
(file)
--- a/
kernel/jump_label.c
+++ b/
kernel/jump_label.c
@@
-793,6
+793,7
@@
int jump_label_text_reserved(void *start, void *end)
static void jump_label_update(struct static_key *key)
{
struct jump_entry *stop = __stop___jump_table;
static void jump_label_update(struct static_key *key)
{
struct jump_entry *stop = __stop___jump_table;
+ bool init = system_state < SYSTEM_RUNNING;
struct jump_entry *entry;
#ifdef CONFIG_MODULES
struct module *mod;
struct jump_entry *entry;
#ifdef CONFIG_MODULES
struct module *mod;
@@
-804,15
+805,16
@@
static void jump_label_update(struct static_key *key)
preempt_disable();
mod = __module_address((unsigned long)key);
preempt_disable();
mod = __module_address((unsigned long)key);
- if (mod)
+ if (mod)
{
stop = mod->jump_entries + mod->num_jump_entries;
stop = mod->jump_entries + mod->num_jump_entries;
+ init = mod->state == MODULE_STATE_COMING;
+ }
preempt_enable();
#endif
entry = static_key_entries(key);
/* if there are no users, entry can be NULL */
if (entry)
preempt_enable();
#endif
entry = static_key_entries(key);
/* if there are no users, entry can be NULL */
if (entry)
- __jump_label_update(key, entry, stop,
- system_state < SYSTEM_RUNNING);
+ __jump_label_update(key, entry, stop, init);
}
#ifdef CONFIG_STATIC_KEYS_SELFTEST
}
#ifdef CONFIG_STATIC_KEYS_SELFTEST