diff options
author | Greg Ungerer <gerg@snapgear.com> | 2005-11-01 23:42:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:41:19 -0500 |
commit | c514b8be7aea4b5d8e16fba3a79b14aec3793f65 (patch) | |
tree | c3a05cc8becce2404f24416fe486ddbb5f05c68f /include/asm-m68knommu/semaphore.h | |
parent | f98e85691bbbca1e72f8bfe9dfee2639e8545790 (diff) |
[PATCH] m68knommu: change use of extern inline to static inline in headers
"extern inline" doesn't make much sense here.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68knommu/semaphore.h')
-rw-r--r-- | include/asm-m68knommu/semaphore.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-m68knommu/semaphore.h b/include/asm-m68knommu/semaphore.h index 17aee15906a6..5cc1fdd86f50 100644 --- a/include/asm-m68knommu/semaphore.h +++ b/include/asm-m68knommu/semaphore.h | |||
@@ -41,7 +41,7 @@ struct semaphore { | |||
41 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 41 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
42 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | 42 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) |
43 | 43 | ||
44 | extern inline void sema_init (struct semaphore *sem, int val) | 44 | static inline void sema_init (struct semaphore *sem, int val) |
45 | { | 45 | { |
46 | *sem = (struct semaphore)__SEMAPHORE_INITIALIZER(*sem, val); | 46 | *sem = (struct semaphore)__SEMAPHORE_INITIALIZER(*sem, val); |
47 | } | 47 | } |
@@ -73,7 +73,7 @@ extern spinlock_t semaphore_wake_lock; | |||
73 | * "down_failed" is a special asm handler that calls the C | 73 | * "down_failed" is a special asm handler that calls the C |
74 | * routine that actually waits. See arch/m68k/lib/semaphore.S | 74 | * routine that actually waits. See arch/m68k/lib/semaphore.S |
75 | */ | 75 | */ |
76 | extern inline void down(struct semaphore * sem) | 76 | static inline void down(struct semaphore * sem) |
77 | { | 77 | { |
78 | might_sleep(); | 78 | might_sleep(); |
79 | __asm__ __volatile__( | 79 | __asm__ __volatile__( |
@@ -88,7 +88,7 @@ extern inline void down(struct semaphore * sem) | |||
88 | : "cc", "%a0", "%a1", "memory"); | 88 | : "cc", "%a0", "%a1", "memory"); |
89 | } | 89 | } |
90 | 90 | ||
91 | extern inline int down_interruptible(struct semaphore * sem) | 91 | static inline int down_interruptible(struct semaphore * sem) |
92 | { | 92 | { |
93 | int ret; | 93 | int ret; |
94 | 94 | ||
@@ -107,7 +107,7 @@ extern inline int down_interruptible(struct semaphore * sem) | |||
107 | return(ret); | 107 | return(ret); |
108 | } | 108 | } |
109 | 109 | ||
110 | extern inline int down_trylock(struct semaphore * sem) | 110 | static inline int down_trylock(struct semaphore * sem) |
111 | { | 111 | { |
112 | register struct semaphore *sem1 __asm__ ("%a1") = sem; | 112 | register struct semaphore *sem1 __asm__ ("%a1") = sem; |
113 | register int result __asm__ ("%d0"); | 113 | register int result __asm__ ("%d0"); |
@@ -135,7 +135,7 @@ extern inline int down_trylock(struct semaphore * sem) | |||
135 | * The default case (no contention) will result in NO | 135 | * The default case (no contention) will result in NO |
136 | * jumps for both down() and up(). | 136 | * jumps for both down() and up(). |
137 | */ | 137 | */ |
138 | extern inline void up(struct semaphore * sem) | 138 | static inline void up(struct semaphore * sem) |
139 | { | 139 | { |
140 | __asm__ __volatile__( | 140 | __asm__ __volatile__( |
141 | "| atomic up operation\n\t" | 141 | "| atomic up operation\n\t" |