---

yaml --- r: 254695 b: refs/heads/master c: 140fe3b h: refs/heads/master i: 254693: 9418a1d 254691: 7e9d613 254687: 2a247d7 v: v3
git-mirror · Jun 29, 2011 · f1624bf · f1624bf
1 parent 561bef4
commit f1624bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: debf1d4948bccf58fa172acb1a7306792d77705d
+refs/heads/master: 140fe3b1ab9c082182ef13359fab4ddba95c24c3
diff --git a/trunk/kernel/jump_label.c b/trunk/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