Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b16b88e5 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8b8a4e33

arch/i386/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86_64/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -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