From 57d801c8412d3fae28eb6dcb46fe4393269d5694 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 16 May 2005 21:53:24 -0700
Subject: [PATCH] --- yaml --- r: 1141 b: refs/heads/master c:
 93ef70a217637ade3f335303a112b22a134a1ec2 h: refs/heads/master i:   1139:
 e5ffad62d21b2e0d70851f89de9524e26e2a6f22 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86_64/mm/ioremap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8da6195945f4..f6a1c0233b35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f5ee8da005f50d9f46ae5a7edba9a9c2d37b32e
+refs/heads/master: 93ef70a217637ade3f335303a112b22a134a1ec2
diff --git a/trunk/arch/x86_64/mm/ioremap.c b/trunk/arch/x86_64/mm/ioremap.c
index 74ec8554b195..c6fb0cb69992 100644
--- a/trunk/arch/x86_64/mm/ioremap.c
+++ b/trunk/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();