Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] sun3 __iomem annotations

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

authored by

Al Viro and committed by
Linus Torvalds
437111ca 1e5c374d

+8 -8
+4 -4
arch/m68k/mm/sun3kmap.c
··· 59 59 } 60 60 } 61 61 62 - void *sun3_ioremap(unsigned long phys, unsigned long size, 62 + void __iomem *sun3_ioremap(unsigned long phys, unsigned long size, 63 63 unsigned long type) 64 64 { 65 65 struct vm_struct *area; ··· 101 101 virt += seg_pages * PAGE_SIZE; 102 102 } 103 103 104 - return (void *)ret; 104 + return (void __iomem *)ret; 105 105 106 106 } 107 107 108 108 109 - void *__ioremap(unsigned long phys, unsigned long size, int cache) 109 + void __iomem *__ioremap(unsigned long phys, unsigned long size, int cache) 110 110 { 111 111 112 112 return sun3_ioremap(phys, size, SUN3_PAGE_TYPE_IO); 113 113 114 114 } 115 115 116 - void iounmap(void *addr) 116 + void iounmap(void __iomem *addr) 117 117 { 118 118 vfree((void *)(PAGE_MASK & (unsigned long)addr)); 119 119 }
+1 -1
drivers/net/sun3_82586.c
··· 330 330 out1: 331 331 free_netdev(dev); 332 332 out: 333 - iounmap((void *)ioaddr); 333 + iounmap((void __iomem *)ioaddr); 334 334 return ERR_PTR(err); 335 335 } 336 336
+3 -3
drivers/net/sun3lance.c
··· 286 286 287 287 out1: 288 288 #ifdef CONFIG_SUN3 289 - iounmap((void *)dev->base_addr); 289 + iounmap((void __iomem *)dev->base_addr); 290 290 #endif 291 291 out: 292 292 free_netdev(dev); ··· 326 326 ioaddr_probe[1] = tmp2; 327 327 328 328 #ifdef CONFIG_SUN3 329 - iounmap((void *)ioaddr); 329 + iounmap((void __iomem *)ioaddr); 330 330 #endif 331 331 return 0; 332 332 } ··· 956 956 { 957 957 unregister_netdev(sun3lance_dev); 958 958 #ifdef CONFIG_SUN3 959 - iounmap((void *)sun3lance_dev->base_addr); 959 + iounmap((void __iomem *)sun3lance_dev->base_addr); 960 960 #endif 961 961 free_netdev(sun3lance_dev); 962 962 }