diff options
| author | Andi Kleen <ak@suse.de> | 2005-05-17 04:53:24 +0000 |
|---|---|---|
| committer | <chrisw@vas.sous-sol.org> | 2005-05-26 21:20:13 -0700 |
| commit | 361716975a00f9fd58ea619fd891b51096d38981 (patch) | |
| tree | a2c2ba2d1d495e1654e88146bb5ac56bfcbeaf52 | |
| parent | c7df5dfb58fdd6fc6983c54cb54add8a18794b19 (diff) | |
| download | linux-stable-361716975a00f9fd58ea619fd891b51096d38981.tar.gz linux-stable-361716975a00f9fd58ea619fd891b51096d38981.tar.bz2 linux-stable-361716975a00f9fd58ea619fd891b51096d38981.zip | |
[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.
Back port to -stable tree by Chris Wright
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
| -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 911262d8ca19..bae79b818d85 100644 --- a/arch/x86_64/mm/ioremap.c +++ b/arch/x86_64/mm/ioremap.c @@ -266,7 +266,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_SIZE) >> PAGE_SHIFT, PAGE_KERNEL); global_flush_tlb(); |