diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-12-15 04:17:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-15 13:04:30 -0500 |
| commit | b16b88e55d808a6324d5ff02d8c686f7884870f8 (patch) | |
| tree | 5a616a73c5322ac2e2b0e01842cbd631797ba53e /arch | |
| parent | 8b8a4e33e4a320735f353a092013b314f142493d (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/mm/ioremap.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/mm/ioremap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c index 8498b5ac3955..247fde76aaed 100644 --- a/arch/i386/mm/ioremap.c +++ b/arch/i386/mm/ioremap.c | |||
| @@ -245,7 +245,7 @@ void iounmap(volatile void __iomem *addr) | |||
| 245 | addr < phys_to_virt(ISA_END_ADDRESS)) | 245 | addr < phys_to_virt(ISA_END_ADDRESS)) |
| 246 | return; | 246 | return; |
| 247 | 247 | ||
| 248 | addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr); | 248 | addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr); |
| 249 | 249 | ||
| 250 | /* Use the vm area unlocked, assuming the caller | 250 | /* Use the vm area unlocked, assuming the caller |
| 251 | ensures there isn't another iounmap for the same address | 251 | 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 0d260e4492f7..ae207064201e 100644 --- a/arch/x86_64/mm/ioremap.c +++ b/arch/x86_64/mm/ioremap.c | |||
| @@ -263,7 +263,7 @@ void iounmap(volatile void __iomem *addr) | |||
| 263 | addr < phys_to_virt(ISA_END_ADDRESS)) | 263 | addr < phys_to_virt(ISA_END_ADDRESS)) |
| 264 | return; | 264 | return; |
| 265 | 265 | ||
| 266 | addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr); | 266 | addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr); |
| 267 | /* Use the vm area unlocked, assuming the caller | 267 | /* Use the vm area unlocked, assuming the caller |
| 268 | ensures there isn't another iounmap for the same address | 268 | ensures there isn't another iounmap for the same address |
| 269 | in parallel. Reuse of the virtual address is prevented by | 269 | in parallel. Reuse of the virtual address is prevented by |