The patch titled
git-x86: PAT fix
has been added to the -mm tree. Its filename is
git-x86-pat-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: git-x86: PAT fix
From: "Siddha, Suresh B" <suresh.b.siddha@xxxxxxxxx>
Fix the iounmap() to call free_matrr() unconditionally.
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Tested-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/ioremap_32.c | 7 +++----
arch/x86/mm/ioremap_64.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff -puN arch/x86/mm/ioremap_32.c~git-x86-pat-fix arch/x86/mm/ioremap_32.c
--- a/arch/x86/mm/ioremap_32.c~git-x86-pat-fix
+++ a/arch/x86/mm/ioremap_32.c
@@ -219,12 +219,11 @@ void iounmap(volatile void __iomem *addr
return;
}
+ free_mattr(p->phys_addr, p->phys_addr + get_vm_area_size(p),
+ p->flags>>20);
/* Reset the direct mapping. Can block */
- if (p->flags >> 20) {
- free_mattr(p->phys_addr, p->phys_addr + get_vm_area_size(p),
- p->flags>>20);
+ if (p->flags >> 20)
ioremap_change_attr(p->phys_addr, get_vm_area_size(p), 0);
- }
/* Finally remove it */
o = remove_vm_area((void *)addr);
diff -puN arch/x86/mm/ioremap_64.c~git-x86-pat-fix arch/x86/mm/ioremap_64.c
--- a/arch/x86/mm/ioremap_64.c~git-x86-pat-fix
+++ a/arch/x86/mm/ioremap_64.c
@@ -190,12 +190,11 @@ void iounmap(volatile void __iomem *addr
return;
}
+ free_mattr(p->phys_addr, p->phys_addr + get_vm_area_size(p),
+ p->flags>>20);
/* Reset the direct mapping. Can block */
- if (p->flags >> 20) {
- free_mattr(p->phys_addr, p->phys_addr + get_vm_area_size(p),
- p->flags>>20);
+ if (p->flags >> 20)
ioremap_change_attr(p->phys_addr, get_vm_area_size(p), 0);
- }
/* Finally remove it */
o = remove_vm_area((void *)addr);
_
Patches currently in -mm which might be from suresh.b.siddha@xxxxxxxxx are
git-x86.patch
git-x86-pat-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
