---

yaml --- r: 182463 b: refs/heads/master c: 076dc4a h: refs/heads/master i: 182461: c67bb87 182459: 7c1daa3 182455: 3f9835f 182447: 808fa5f 182431: ab701cc 182399: c01428d v: v3
git-mirror · Feb 7, 2010 · 1ed8cb2 · 1ed8cb2
1 parent 8f9c322
commit 1ed8cb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f485364365f00853e5249cb3ae31f876936b552
+refs/heads/master: 076dc4a65a6d99a16979e2c7917e669fb8c91ee5
diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c
@@ -395,12 +395,14 @@ int alternatives_text_reserved(void *start, void *end)
 {
 	struct smp_alt_module *mod;
 	u8 **ptr;
+	u8 *text_start = start;
+	u8 *text_end = end;
 
 	list_for_each_entry(mod, &smp_alt_modules, next) {
-		if (mod->text > end || mod->text_end < start)
+		if (mod->text > text_end || mod->text_end < text_start)
 			continue;
 		for (ptr = mod->locks; ptr < mod->locks_end; ptr++)
-			if (start <= *ptr && end >= *ptr)
+			if (text_start <= *ptr && text_end >= *ptr)
 				return 1;
 	}