diff options
author | Andi Kleen <ak@suse.de> | 2005-05-17 00:53:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 10:59:14 -0400 |
commit | 93ef70a217637ade3f335303a112b22a134a1ec2 (patch) | |
tree | b5d1e3e603823d798b77a91641f63f10a0a733b1 /arch/x86_64/mm | |
parent | 1f5ee8da005f50d9f46ae5a7edba9a9c2d37b32e (diff) |
[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>
Diffstat (limited to 'arch/x86_64/mm')
-rw-r--r-- | arch/x86_64/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c index 74ec8554b195..c6fb0cb69992 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) | |||
272 | if ((p->flags >> 20) && | 272 | if ((p->flags >> 20) && |
273 | p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) { | 273 | p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) { |
274 | /* p->size includes the guard page, but cpa doesn't like that */ | 274 | /* p->size includes the guard page, but cpa doesn't like that */ |
275 | change_page_attr(virt_to_page(__va(p->phys_addr)), | 275 | change_page_attr_addr((unsigned long)__va(p->phys_addr), |
276 | p->size >> PAGE_SHIFT, | 276 | p->size >> PAGE_SHIFT, |
277 | PAGE_KERNEL); | 277 | PAGE_KERNEL); |
278 | global_flush_tlb(); | 278 | global_flush_tlb(); |