[PATCH] i386,amd64: ioremap.c __iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index 8498b5ac3955c54939bec5acca0754ba314238c0..247fde76aaeddaf0c81215917a015bda7ea648ae 100644 (file)
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -245,7 +245,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

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