From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 4 Feb 2008 15:48:05 +0000 (+0100)
Subject: x86: no CPA on iounmap
X-Git-Tag: v2.6.25-rc1~1057^2~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f56d005d30342a45d8af2b75ecccc82200f09600;p=linux-2.6-omap-h63xx.git

x86: no CPA on iounmap

When an ioremap is unmapped, do not change the page attributes. There might
be another mapping of the same physical address. PAT might detect a conflicting
mapping attribute for no good reason. The mapping is removed anyway.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 4e21231a5ce..ee6648fe6b1 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -240,9 +240,6 @@ void iounmap(volatile void __iomem *addr)
 		return;
 	}
 
-	/* Reset the direct mapping. Can block */
-	ioremap_change_attr(p->phys_addr, p->size, IOR_MODE_CACHED);
-
 	/* Finally remove it */
 	o = remove_vm_area((void *)addr);
 	BUG_ON(p != o || o == NULL);