aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/semaphore.h
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-10-16 17:24:59 -0400
committerKyle McMartin <kyle@shortfin.cabal.ca>2007-10-18 03:58:41 -0400
commitf13cec8447f18cca3a0feb4b83b7ba6fae9e59ae (patch)
treeab42ee63ed1a108262c9a7267fa7e36d8a9e923d /include/asm-parisc/semaphore.h
parent0ed5462927211286502576142bd322d850b49a86 (diff)
[PARISC] parisc: "extern inline" -> "static inline"
"extern inline" will have different semantics with gcc 4.3, and "static inline" is correct here. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Matthew Wilcox <willy@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'include/asm-parisc/semaphore.h')
-rw-r--r--include/asm-parisc/semaphore.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-parisc/semaphore.h b/include/asm-parisc/semaphore.h
index b771dcfcfdd1..a16271cdc748 100644
--- a/include/asm-parisc/semaphore.h
+++ b/include/asm-parisc/semaphore.h
@@ -54,7 +54,7 @@ struct semaphore {
54 54
55#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 55#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
56 56
57extern inline void sema_init (struct semaphore *sem, int val) 57static inline void sema_init (struct semaphore *sem, int val)
58{ 58{
59 *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); 59 *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val);
60} 60}
@@ -82,7 +82,7 @@ asmlinkage void __up(struct semaphore * sem);
82 * interrupts while we're messing with the semaphore. Sorry. 82 * interrupts while we're messing with the semaphore. Sorry.
83 */ 83 */
84 84
85extern __inline__ void down(struct semaphore * sem) 85static inline void down(struct semaphore * sem)
86{ 86{
87 might_sleep(); 87 might_sleep();
88 spin_lock_irq(&sem->sentry); 88 spin_lock_irq(&sem->sentry);
@@ -94,7 +94,7 @@ extern __inline__ void down(struct semaphore * sem)
94 spin_unlock_irq(&sem->sentry); 94 spin_unlock_irq(&sem->sentry);
95} 95}
96 96
97extern __inline__ int down_interruptible(struct semaphore * sem) 97static inline int down_interruptible(struct semaphore * sem)
98{ 98{
99 int ret = 0; 99 int ret = 0;
100 might_sleep(); 100 might_sleep();
@@ -112,7 +112,7 @@ extern __inline__ int down_interruptible(struct semaphore * sem)
112 * down_trylock returns 0 on success, 1 if we failed to get the lock. 112 * down_trylock returns 0 on success, 1 if we failed to get the lock.
113 * May not sleep, but must preserve irq state 113 * May not sleep, but must preserve irq state
114 */ 114 */
115extern __inline__ int down_trylock(struct semaphore * sem) 115static inline int down_trylock(struct semaphore * sem)
116{ 116{
117 unsigned long flags; 117 unsigned long flags;
118 int count; 118 int count;
@@ -129,7 +129,7 @@ extern __inline__ int down_trylock(struct semaphore * sem)
129 * Note! This is subtle. We jump to wake people up only if 129 * Note! This is subtle. We jump to wake people up only if
130 * the semaphore was negative (== somebody was waiting on it). 130 * the semaphore was negative (== somebody was waiting on it).
131 */ 131 */
132extern __inline__ void up(struct semaphore * sem) 132static inline void up(struct semaphore * sem)
133{ 133{
134 unsigned long flags; 134 unsigned long flags;
135 135