aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-cris/semaphore.h
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-11-07 03:58:44 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:30 -0500
commitd9b5444eeb3a663ca4a625878b1421c9e9b18e8b (patch)
tree6cc32711116977944043c54e0c196c75358916be /include/asm-cris/semaphore.h
parent5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f (diff)
[PATCH] cris: "extern inline" -> "static inline"
"extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris/semaphore.h')
-rw-r--r--include/asm-cris/semaphore.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-cris/semaphore.h b/include/asm-cris/semaphore.h
index a19568e6aae6..53f548b791c1 100644
--- a/include/asm-cris/semaphore.h
+++ b/include/asm-cris/semaphore.h
@@ -37,17 +37,17 @@ struct semaphore {
37#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 37#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
38#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 38#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0)
39 39
40extern inline void sema_init(struct semaphore *sem, int val) 40static inline void sema_init(struct semaphore *sem, int val)
41{ 41{
42 *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); 42 *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val);
43} 43}
44 44
45extern inline void init_MUTEX (struct semaphore *sem) 45static inline void init_MUTEX (struct semaphore *sem)
46{ 46{
47 sema_init(sem, 1); 47 sema_init(sem, 1);
48} 48}
49 49
50extern inline void init_MUTEX_LOCKED (struct semaphore *sem) 50static inline void init_MUTEX_LOCKED (struct semaphore *sem)
51{ 51{
52 sema_init(sem, 0); 52 sema_init(sem, 0);
53} 53}
@@ -59,7 +59,7 @@ extern void __up(struct semaphore * sem);
59 59
60/* notice - we probably can do cli/sti here instead of saving */ 60/* notice - we probably can do cli/sti here instead of saving */
61 61
62extern inline void down(struct semaphore * sem) 62static inline void down(struct semaphore * sem)
63{ 63{
64 unsigned long flags; 64 unsigned long flags;
65 int failed; 65 int failed;
@@ -81,7 +81,7 @@ extern inline void down(struct semaphore * sem)
81 * returns negative for signalled and zero for semaphore acquired. 81 * returns negative for signalled and zero for semaphore acquired.
82 */ 82 */
83 83
84extern inline int down_interruptible(struct semaphore * sem) 84static inline int down_interruptible(struct semaphore * sem)
85{ 85{
86 unsigned long flags; 86 unsigned long flags;
87 int failed; 87 int failed;
@@ -97,7 +97,7 @@ extern inline int down_interruptible(struct semaphore * sem)
97 return(failed); 97 return(failed);
98} 98}
99 99
100extern inline int down_trylock(struct semaphore * sem) 100static inline int down_trylock(struct semaphore * sem)
101{ 101{
102 unsigned long flags; 102 unsigned long flags;
103 int failed; 103 int failed;
@@ -117,7 +117,7 @@ extern inline int down_trylock(struct semaphore * sem)
117 * The default case (no contention) will result in NO 117 * The default case (no contention) will result in NO
118 * jumps for both down() and up(). 118 * jumps for both down() and up().
119 */ 119 */
120extern inline void up(struct semaphore * sem) 120static inline void up(struct semaphore * sem)
121{ 121{
122 unsigned long flags; 122 unsigned long flags;
123 int wakeup; 123 int wakeup;