diff options
author | Venki Pallipadi <venkatesh.pallipadi@intel.com> | 2008-08-22 15:08:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:33:12 -0400 |
commit | 01de05af94db5d5214b0a5e191068d19c82059a8 (patch) | |
tree | f5b66cee99ca4ca2f45ba32d7d87785da66f8c30 /arch/x86/mm/pageattr.c | |
parent | 5f310b63781f6777bf4e812570560ec0f8ea42d8 (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>
Diffstat (limited to 'arch/x86/mm/pageattr.c')
-rw-r--r-- | arch/x86/mm/pageattr.c | 2 |
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: | |||
967 | 967 | ||
968 | if (tmp == start) | 968 | if (tmp == start) |
969 | break; | 969 | break; |
970 | for (end = start + PAGE_SIZE; i < addrinarray - 1; end += PAGE_SIZE) { | 970 | for (end = tmp + PAGE_SIZE; i < addrinarray - 1; end += PAGE_SIZE) { |
971 | if (end != __pa(addr[i + 1])) | 971 | if (end != __pa(addr[i + 1])) |
972 | break; | 972 | break; |
973 | i++; | 973 | i++; |