Browse Source

[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>
Al Viro 19 years ago
parent
commit
b16b88e55d
2 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/i386/mm/ioremap.c
  2. 1 1
      arch/x86_64/mm/ioremap.c

+ 1 - 1
arch/i386/mm/ioremap.c

@@ -245,7 +245,7 @@ void iounmap(volatile void __iomem *addr)
 			addr < phys_to_virt(ISA_END_ADDRESS))
 			addr < phys_to_virt(ISA_END_ADDRESS))
 		return;
 		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
 	/* Use the vm area unlocked, assuming the caller
 	   ensures there isn't another iounmap for the same address
 	   ensures there isn't another iounmap for the same address

+ 1 - 1
arch/x86_64/mm/ioremap.c

@@ -263,7 +263,7 @@ void iounmap(volatile void __iomem *addr)
 		addr < phys_to_virt(ISA_END_ADDRESS))
 		addr < phys_to_virt(ISA_END_ADDRESS))
 		return;
 		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
 	/* Use the vm area unlocked, assuming the caller
 	   ensures there isn't another iounmap for the same address
 	   ensures there isn't another iounmap for the same address
 	   in parallel. Reuse of the virtual address is prevented by
 	   in parallel. Reuse of the virtual address is prevented by