From: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Fri, 22 Aug 2008 19:08:17 +0000 (-0700)
Subject: x86: have set_memory_array_{uc,wb} coalesce memtypes, fix
X-Git-Tag: v2.6.28-rc1~713^2~15
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=01de05af94db5d5214b0a5e191068d19c82059a8;p=linux-2.6-omap-h63xx.git

x86: have set_memory_array_{uc,wb} coalesce memtypes, fix

Fix the start addr for free_memtype calls in the error path.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Acked-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 497108825da..4b6968ba086 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -967,7 +967,7 @@ out:
 
 		if (tmp == start)
 			break;
-		for (end = start + PAGE_SIZE; i < addrinarray - 1; end += PAGE_SIZE) {
+		for (end = tmp + PAGE_SIZE; i < addrinarray - 1; end += PAGE_SIZE) {
 			if (end != __pa(addr[i + 1]))
 				break;
 			i++;