summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenki Pallipadi <venkatesh.pallipadi@intel.com>2008-08-22 12:08:17 -0700
committerIngo Molnar <mingo@elte.hu>2008-08-23 17:33:12 +0200
commit01de05af94db5d5214b0a5e191068d19c82059a8 (patch)
treef5b66cee99ca4ca2f45ba32d7d87785da66f8c30
parent5f310b63781f6777bf4e812570560ec0f8ea42d8 (diff)
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>
-rw-r--r--arch/x86/mm/pageattr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 497108825da9..4b6968ba0864 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++;