diff options
| author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2011-06-21 04:35:55 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-06-29 15:59:17 +0200 |
| commit | 140fe3b1ab9c082182ef13359fab4ddba95c24c3 (patch) | |
| tree | e59debeb1aea1650fd490b0264f66b4f70a26aca | |
| parent | Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/... (diff) | |
| download | linux-140fe3b1ab9c082182ef13359fab4ddba95c24c3.tar.xz linux-140fe3b1ab9c082182ef13359fab4ddba95c24c3.zip | |
jump_label: Fix jump_label update for modules
The jump labels entries for modules do not stop at __stop__jump_table,
but after mod->jump_entries + mod_num_jump_entries.
By checking the wrong end point, module trace events never get enabled.
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: Jason Baron <jbaron@redhat.com>
Tested-by: Avi Kivity <avi@redhat.com>
Tested-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Link: http://lkml.kernel.org/r/4E00038B.2060404@cn.fujitsu.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/jump_label.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index fa27e750dbc0..a8ce45097f3d 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -375,15 +375,19 @@ int jump_label_text_reserved(void *start, void *end) static void jump_label_update(struct jump_label_key *key, int enable) { - struct jump_entry *entry = key->entries; - - /* if there are no users, entry can be NULL */ - if (entry) - __jump_label_update(key, entry, __stop___jump_table, enable); + struct jump_entry *entry = key->entries, *stop = __stop___jump_table; #ifdef CONFIG_MODULES + struct module *mod = __module_address((jump_label_t)key); + __jump_label_mod_update(key, enable); + + if (mod) + stop = mod->jump_entries + mod->num_jump_entries; #endif + /* if there are no users, entry can be NULL */ + if (entry) + __jump_label_update(key, entry, stop, enable); } #endif |