Merge branch 'master' of /usr/src/ntfs-2.6/

[linux-2.6] / arch / x86_64 / mm / ioremap.c

diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c
index 0d260e4492f7f96775dbbb641478a0a65ca838ba..ae207064201e19697160a332a3399f9a0594b2f8 100644 (file)
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
@@ -263,7 +263,7 @@ void iounmap(volatile void __iomem *addr)
                addr < phys_to_virt(ISA_END_ADDRESS))
                return;
 
-       addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr);
+       addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);
        /* Use the vm area unlocked, assuming the caller
           ensures there isn't another iounmap for the same address
           in parallel. Reuse of the virtual address is prevented by