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 497108825da975b15d40e8a184f034710fb56ed1..4b6968ba0864b3e71fb343b6e7ded13dc2cc929d 100644 (file)
--- 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++;