summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-05-16 21:53:24 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 07:59:14 -0700
commit93ef70a217637ade3f335303a112b22a134a1ec2 (patch)
treeb5d1e3e603823d798b77a91641f63f10a0a733b1
parent1f5ee8da005f50d9f46ae5a7edba9a9c2d37b32e (diff)
downloadop-kernel-dev-93ef70a217637ade3f335303a112b22a134a1ec2.zip
op-kernel-dev-93ef70a217637ade3f335303a112b22a134a1ec2.tar.gz
[PATCH] x86_64: Don't look up struct page pointer of physical address in iounmap
It could be in a memory hole not mapped in mem_map and that causes the hash lookup to go off to nirvana. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/mm/ioremap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c
index 74ec855..c6fb0cb 100644
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
@@ -272,7 +272,7 @@ void iounmap(volatile void __iomem *addr)
if ((p->flags >> 20) &&
p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) {
/* p->size includes the guard page, but cpa doesn't like that */
- change_page_attr(virt_to_page(__va(p->phys_addr)),
+ change_page_attr_addr((unsigned long)__va(p->phys_addr),
p->size >> PAGE_SHIFT,
PAGE_KERNEL);
global_flush_tlb();
OpenPOWER on IntegriCloud