[GIT PULL][v3.0] jump_label: Fix jump_label update for modules

[Steven Rostedt]

Ingo,

Please pull the latest tip/perf/urgent tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/urgent

Head SHA1: 140fe3b1ab9c082182ef13359fab4ddba95c24c3


Xiao Guangrong (1):
      jump_label: Fix jump_label update for modules

----
 kernel/jump_label.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---------------------------
commit 140fe3b1ab9c082182ef13359fab4ddba95c24c3
Author: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxxxxx>
Date:   Tue Jun 21 10:35:55 2011 +0800

    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@xxxxxxx>
    Acked-by: Jason Baron <jbaron@xxxxxxxxxx>
    Tested-by: Avi Kivity <avi@xxxxxxxxxx>
    Tested-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
    Signed-off-by: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxxxxx>
    Link: http://lkml.kernel.org/r/4E00038B.2060404@xxxxxxxxxxxxxx
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index fa27e75..a8ce450 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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/