aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mm/sun3kmap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/mm/sun3kmap.c b/arch/m68k/mm/sun3kmap.c
index 7f0d86f3fe73..8caa45908cb1 100644
--- a/arch/m68k/mm/sun3kmap.c
+++ b/arch/m68k/mm/sun3kmap.c
@@ -59,7 +59,7 @@ static inline void do_pmeg_mapin(unsigned long phys, unsigned long virt,
59 } 59 }
60} 60}
61 61
62void *sun3_ioremap(unsigned long phys, unsigned long size, 62void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
63 unsigned long type) 63 unsigned long type)
64{ 64{
65 struct vm_struct *area; 65 struct vm_struct *area;
@@ -101,19 +101,19 @@ void *sun3_ioremap(unsigned long phys, unsigned long size,
101 virt += seg_pages * PAGE_SIZE; 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
109void *__ioremap(unsigned long phys, unsigned long size, int cache) 109void __iomem *__ioremap(unsigned long phys, unsigned long size, int cache)
110{ 110{
111 111
112 return sun3_ioremap(phys, size, SUN3_PAGE_TYPE_IO); 112 return sun3_ioremap(phys, size, SUN3_PAGE_TYPE_IO);
113 113
114} 114}
115 115
116void iounmap(void *addr) 116void iounmap(void __iomem *addr)
117{ 117{
118 vfree((void *)(PAGE_MASK & (unsigned long)addr)); 118 vfree((void *)(PAGE_MASK & (unsigned long)addr));
119} 119}