Skip to contentSkip to conversation

jump_label: fix jump_label update

PATCH New Avi Kivity 1 participant 1 message Jun 23, 2011

Subsystems (2)
lore
Share & tools
lore

Avi Kivity

author
#0 lore raw

PATCH v2 1/1 jump_label: fix jump_label update

If you're having ftrace issues with kvm.git, this patch should fix them up.

-------- Original Message --------
Subject: [PATCH v2] jump_label: fix jump_label update
Date: Tue, 21 Jun 2011 10:35:55 +0800
From: Xiao Guangrong <[email protected]>
To: Ingo Molnar <[email protected]>
CC: Steven Rostedt <[email protected]>, Jason Baron <[email protected]>, Jiri Olsa <[email protected]>, LKML <[email protected]>

The key of module is out of __stop___jump_table, it causes the events of modules does not work

---
 kernel/jump_label.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
kernel/jump_label.c +9 -5
index fa27e75..a8ce450 100644
@@ -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
Signature · 6 lines
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/