aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/iomap.c32
-rw-r--r--lib/rwsem-spinlock.c16
-rw-r--r--lib/semaphore-sleepers.c8
3 files changed, 28 insertions, 28 deletions
diff --git a/lib/iomap.c b/lib/iomap.c
index 72c42687ba10..db004a9ff509 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -69,27 +69,27 @@ static void bad_io_access(unsigned long port, const char *access)
69#define mmio_read32be(addr) be32_to_cpu(__raw_readl(addr)) 69#define mmio_read32be(addr) be32_to_cpu(__raw_readl(addr))
70#endif 70#endif
71 71
72unsigned int fastcall ioread8(void __iomem *addr) 72unsigned int ioread8(void __iomem *addr)
73{ 73{
74 IO_COND(addr, return inb(port), return readb(addr)); 74 IO_COND(addr, return inb(port), return readb(addr));
75 return 0xff; 75 return 0xff;
76} 76}
77unsigned int fastcall ioread16(void __iomem *addr) 77unsigned int ioread16(void __iomem *addr)
78{ 78{
79 IO_COND(addr, return inw(port), return readw(addr)); 79 IO_COND(addr, return inw(port), return readw(addr));
80 return 0xffff; 80 return 0xffff;
81} 81}
82unsigned int fastcall ioread16be(void __iomem *addr) 82unsigned int ioread16be(void __iomem *addr)
83{ 83{
84 IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr)); 84 IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr));
85 return 0xffff; 85 return 0xffff;
86} 86}
87unsigned int fastcall ioread32(void __iomem *addr) 87unsigned int ioread32(void __iomem *addr)
88{ 88{
89 IO_COND(addr, return inl(port), return readl(addr)); 89 IO_COND(addr, return inl(port), return readl(addr));
90 return 0xffffffff; 90 return 0xffffffff;
91} 91}
92unsigned int fastcall ioread32be(void __iomem *addr) 92unsigned int ioread32be(void __iomem *addr)
93{ 93{
94 IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr)); 94 IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr));
95 return 0xffffffff; 95 return 0xffffffff;
@@ -110,23 +110,23 @@ EXPORT_SYMBOL(ioread32be);
110#define mmio_write32be(val,port) __raw_writel(be32_to_cpu(val),port) 110#define mmio_write32be(val,port) __raw_writel(be32_to_cpu(val),port)
111#endif 111#endif
112 112
113void fastcall iowrite8(u8 val, void __iomem *addr) 113void iowrite8(u8 val, void __iomem *addr)
114{ 114{
115 IO_COND(addr, outb(val,port), writeb(val, addr)); 115 IO_COND(addr, outb(val,port), writeb(val, addr));
116} 116}
117void fastcall iowrite16(u16 val, void __iomem *addr) 117void iowrite16(u16 val, void __iomem *addr)
118{ 118{
119 IO_COND(addr, outw(val,port), writew(val, addr)); 119 IO_COND(addr, outw(val,port), writew(val, addr));
120} 120}
121void fastcall iowrite16be(u16 val, void __iomem *addr) 121void iowrite16be(u16 val, void __iomem *addr)
122{ 122{
123 IO_COND(addr, pio_write16be(val,port), mmio_write16be(val, addr)); 123 IO_COND(addr, pio_write16be(val,port), mmio_write16be(val, addr));
124} 124}
125void fastcall iowrite32(u32 val, void __iomem *addr) 125void iowrite32(u32 val, void __iomem *addr)
126{ 126{
127 IO_COND(addr, outl(val,port), writel(val, addr)); 127 IO_COND(addr, outl(val,port), writel(val, addr));
128} 128}
129void fastcall iowrite32be(u32 val, void __iomem *addr) 129void iowrite32be(u32 val, void __iomem *addr)
130{ 130{
131 IO_COND(addr, pio_write32be(val,port), mmio_write32be(val, addr)); 131 IO_COND(addr, pio_write32be(val,port), mmio_write32be(val, addr));
132} 132}
@@ -193,15 +193,15 @@ static inline void mmio_outsl(void __iomem *addr, const u32 *src, int count)
193} 193}
194#endif 194#endif
195 195
196void fastcall ioread8_rep(void __iomem *addr, void *dst, unsigned long count) 196void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
197{ 197{
198 IO_COND(addr, insb(port,dst,count), mmio_insb(addr, dst, count)); 198 IO_COND(addr, insb(port,dst,count), mmio_insb(addr, dst, count));
199} 199}
200void fastcall ioread16_rep(void __iomem *addr, void *dst, unsigned long count) 200void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
201{ 201{
202 IO_COND(addr, insw(port,dst,count), mmio_insw(addr, dst, count)); 202 IO_COND(addr, insw(port,dst,count), mmio_insw(addr, dst, count));
203} 203}
204void fastcall ioread32_rep(void __iomem *addr, void *dst, unsigned long count) 204void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
205{ 205{
206 IO_COND(addr, insl(port,dst,count), mmio_insl(addr, dst, count)); 206 IO_COND(addr, insl(port,dst,count), mmio_insl(addr, dst, count));
207} 207}
@@ -209,15 +209,15 @@ EXPORT_SYMBOL(ioread8_rep);
209EXPORT_SYMBOL(ioread16_rep); 209EXPORT_SYMBOL(ioread16_rep);
210EXPORT_SYMBOL(ioread32_rep); 210EXPORT_SYMBOL(ioread32_rep);
211 211
212void fastcall iowrite8_rep(void __iomem *addr, const void *src, unsigned long count) 212void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
213{ 213{
214 IO_COND(addr, outsb(port, src, count), mmio_outsb(addr, src, count)); 214 IO_COND(addr, outsb(port, src, count), mmio_outsb(addr, src, count));
215} 215}
216void fastcall iowrite16_rep(void __iomem *addr, const void *src, unsigned long count) 216void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
217{ 217{
218 IO_COND(addr, outsw(port, src, count), mmio_outsw(addr, src, count)); 218 IO_COND(addr, outsw(port, src, count), mmio_outsw(addr, src, count));
219} 219}
220void fastcall iowrite32_rep(void __iomem *addr, const void *src, unsigned long count) 220void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
221{ 221{
222 IO_COND(addr, outsl(port, src,count), mmio_outsl(addr, src, count)); 222 IO_COND(addr, outsl(port, src,count), mmio_outsl(addr, src, count));
223} 223}
diff --git a/lib/rwsem-spinlock.c b/lib/rwsem-spinlock.c
index c4cfd6c0342f..9df3ca56db11 100644
--- a/lib/rwsem-spinlock.c
+++ b/lib/rwsem-spinlock.c
@@ -125,7 +125,7 @@ __rwsem_wake_one_writer(struct rw_semaphore *sem)
125/* 125/*
126 * get a read lock on the semaphore 126 * get a read lock on the semaphore
127 */ 127 */
128void fastcall __sched __down_read(struct rw_semaphore *sem) 128void __sched __down_read(struct rw_semaphore *sem)
129{ 129{
130 struct rwsem_waiter waiter; 130 struct rwsem_waiter waiter;
131 struct task_struct *tsk; 131 struct task_struct *tsk;
@@ -168,7 +168,7 @@ void fastcall __sched __down_read(struct rw_semaphore *sem)
168/* 168/*
169 * trylock for reading -- returns 1 if successful, 0 if contention 169 * trylock for reading -- returns 1 if successful, 0 if contention
170 */ 170 */
171int fastcall __down_read_trylock(struct rw_semaphore *sem) 171int __down_read_trylock(struct rw_semaphore *sem)
172{ 172{
173 unsigned long flags; 173 unsigned long flags;
174 int ret = 0; 174 int ret = 0;
@@ -191,7 +191,7 @@ int fastcall __down_read_trylock(struct rw_semaphore *sem)
191 * get a write lock on the semaphore 191 * get a write lock on the semaphore
192 * - we increment the waiting count anyway to indicate an exclusive lock 192 * - we increment the waiting count anyway to indicate an exclusive lock
193 */ 193 */
194void fastcall __sched __down_write_nested(struct rw_semaphore *sem, int subclass) 194void __sched __down_write_nested(struct rw_semaphore *sem, int subclass)
195{ 195{
196 struct rwsem_waiter waiter; 196 struct rwsem_waiter waiter;
197 struct task_struct *tsk; 197 struct task_struct *tsk;
@@ -231,7 +231,7 @@ void fastcall __sched __down_write_nested(struct rw_semaphore *sem, int subclass
231 ; 231 ;
232} 232}
233 233
234void fastcall __sched __down_write(struct rw_semaphore *sem) 234void __sched __down_write(struct rw_semaphore *sem)
235{ 235{
236 __down_write_nested(sem, 0); 236 __down_write_nested(sem, 0);
237} 237}
@@ -239,7 +239,7 @@ void fastcall __sched __down_write(struct rw_semaphore *sem)
239/* 239/*
240 * trylock for writing -- returns 1 if successful, 0 if contention 240 * trylock for writing -- returns 1 if successful, 0 if contention
241 */ 241 */
242int fastcall __down_write_trylock(struct rw_semaphore *sem) 242int __down_write_trylock(struct rw_semaphore *sem)
243{ 243{
244 unsigned long flags; 244 unsigned long flags;
245 int ret = 0; 245 int ret = 0;
@@ -260,7 +260,7 @@ int fastcall __down_write_trylock(struct rw_semaphore *sem)
260/* 260/*
261 * release a read lock on the semaphore 261 * release a read lock on the semaphore
262 */ 262 */
263void fastcall __up_read(struct rw_semaphore *sem) 263void __up_read(struct rw_semaphore *sem)
264{ 264{
265 unsigned long flags; 265 unsigned long flags;
266 266
@@ -275,7 +275,7 @@ void fastcall __up_read(struct rw_semaphore *sem)
275/* 275/*
276 * release a write lock on the semaphore 276 * release a write lock on the semaphore
277 */ 277 */
278void fastcall __up_write(struct rw_semaphore *sem) 278void __up_write(struct rw_semaphore *sem)
279{ 279{
280 unsigned long flags; 280 unsigned long flags;
281 281
@@ -292,7 +292,7 @@ void fastcall __up_write(struct rw_semaphore *sem)
292 * downgrade a write lock into a read lock 292 * downgrade a write lock into a read lock
293 * - just wake up any readers at the front of the queue 293 * - just wake up any readers at the front of the queue
294 */ 294 */
295void fastcall __downgrade_write(struct rw_semaphore *sem) 295void __downgrade_write(struct rw_semaphore *sem)
296{ 296{
297 unsigned long flags; 297 unsigned long flags;
298 298
diff --git a/lib/semaphore-sleepers.c b/lib/semaphore-sleepers.c
index 128180523860..0198782cdacb 100644
--- a/lib/semaphore-sleepers.c
+++ b/lib/semaphore-sleepers.c
@@ -48,12 +48,12 @@
48 * we cannot lose wakeup events. 48 * we cannot lose wakeup events.
49 */ 49 */
50 50
51fastcall void __up(struct semaphore *sem) 51void __up(struct semaphore *sem)
52{ 52{
53 wake_up(&sem->wait); 53 wake_up(&sem->wait);
54} 54}
55 55
56fastcall void __sched __down(struct semaphore * sem) 56void __sched __down(struct semaphore *sem)
57{ 57{
58 struct task_struct *tsk = current; 58 struct task_struct *tsk = current;
59 DECLARE_WAITQUEUE(wait, tsk); 59 DECLARE_WAITQUEUE(wait, tsk);
@@ -90,7 +90,7 @@ fastcall void __sched __down(struct semaphore * sem)
90 tsk->state = TASK_RUNNING; 90 tsk->state = TASK_RUNNING;
91} 91}
92 92
93fastcall int __sched __down_interruptible(struct semaphore * sem) 93int __sched __down_interruptible(struct semaphore *sem)
94{ 94{
95 int retval = 0; 95 int retval = 0;
96 struct task_struct *tsk = current; 96 struct task_struct *tsk = current;
@@ -153,7 +153,7 @@ fastcall int __sched __down_interruptible(struct semaphore * sem)
153 * single "cmpxchg" without failure cases, 153 * single "cmpxchg" without failure cases,
154 * but then it wouldn't work on a 386. 154 * but then it wouldn't work on a 386.
155 */ 155 */
156fastcall int __down_trylock(struct semaphore * sem) 156int __down_trylock(struct semaphore *sem)
157{ 157{
158 int sleepers; 158 int sleepers;
159 unsigned long flags; 159 unsigned long flags;