From 1ed8cb27c9329a3643352acaa63752e66aee54f6 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Fri, 5 Feb 2010 12:16:47 -0500
Subject: [PATCH] --- yaml --- r: 182463 b: refs/heads/master c:
 076dc4a65a6d99a16979e2c7917e669fb8c91ee5 h: refs/heads/master i:   182461:
 c67bb872315b8a2258c5b9fbb4e3aee7c98d4da9   182459:
 7c1daa34a6787126a902d181a8ffe67ff5b2af59   182455:
 3f9835f71ea617f215bbf951bb2f70b68c810dc8   182447:
 808fa5f521c28b835dafe75ba9c66cc013ec4933   182431:
 ab701cc170deac1c6dce264c30af1c08818858a8   182399:
 c01428dffdb69ffd3584cc653409c6275fcb2173 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/alternative.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed3c0570b55c..34d059527474 100644
--- 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
index 3c13284ff86d..e63b80e5861c 100644
--- 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;
 	}