diff options
| -rw-r--r-- | include/asm-cris/arch-v10/bitops.h | 10 | ||||
| -rw-r--r-- | include/asm-cris/semaphore-helper.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-cris/arch-v10/bitops.h b/include/asm-cris/arch-v10/bitops.h index b73f5396e5a6..be85f6de25d3 100644 --- a/include/asm-cris/arch-v10/bitops.h +++ b/include/asm-cris/arch-v10/bitops.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * number. They differ in that the first function also inverts all bits | 10 | * number. They differ in that the first function also inverts all bits |
| 11 | * in the input. | 11 | * in the input. |
| 12 | */ | 12 | */ |
| 13 | extern inline unsigned long cris_swapnwbrlz(unsigned long w) | 13 | static inline unsigned long cris_swapnwbrlz(unsigned long w) |
| 14 | { | 14 | { |
| 15 | /* Let's just say we return the result in the same register as the | 15 | /* Let's just say we return the result in the same register as the |
| 16 | input. Saying we clobber the input but can return the result | 16 | input. Saying we clobber the input but can return the result |
| @@ -26,7 +26,7 @@ extern inline unsigned long cris_swapnwbrlz(unsigned long w) | |||
| 26 | return res; | 26 | return res; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | extern inline unsigned long cris_swapwbrlz(unsigned long w) | 29 | static inline unsigned long cris_swapwbrlz(unsigned long w) |
| 30 | { | 30 | { |
| 31 | unsigned res; | 31 | unsigned res; |
| 32 | __asm__ ("swapwbr %0 \n\t" | 32 | __asm__ ("swapwbr %0 \n\t" |
| @@ -40,7 +40,7 @@ extern inline unsigned long cris_swapwbrlz(unsigned long w) | |||
| 40 | * ffz = Find First Zero in word. Undefined if no zero exists, | 40 | * ffz = Find First Zero in word. Undefined if no zero exists, |
| 41 | * so code should check against ~0UL first.. | 41 | * so code should check against ~0UL first.. |
| 42 | */ | 42 | */ |
| 43 | extern inline unsigned long ffz(unsigned long w) | 43 | static inline unsigned long ffz(unsigned long w) |
| 44 | { | 44 | { |
| 45 | return cris_swapnwbrlz(w); | 45 | return cris_swapnwbrlz(w); |
| 46 | } | 46 | } |
| @@ -51,7 +51,7 @@ extern inline unsigned long ffz(unsigned long w) | |||
| 51 | * | 51 | * |
| 52 | * Undefined if no bit exists, so code should check against 0 first. | 52 | * Undefined if no bit exists, so code should check against 0 first. |
| 53 | */ | 53 | */ |
| 54 | extern inline unsigned long __ffs(unsigned long word) | 54 | static inline unsigned long __ffs(unsigned long word) |
| 55 | { | 55 | { |
| 56 | return cris_swapnwbrlz(~word); | 56 | return cris_swapnwbrlz(~word); |
| 57 | } | 57 | } |
| @@ -65,7 +65,7 @@ extern inline unsigned long __ffs(unsigned long word) | |||
| 65 | * differs in spirit from the above ffz (man ffs). | 65 | * differs in spirit from the above ffz (man ffs). |
| 66 | */ | 66 | */ |
| 67 | 67 | ||
| 68 | extern inline unsigned long kernel_ffs(unsigned long w) | 68 | static inline unsigned long kernel_ffs(unsigned long w) |
| 69 | { | 69 | { |
| 70 | return w ? cris_swapwbrlz (w) + 1 : 0; | 70 | return w ? cris_swapwbrlz (w) + 1 : 0; |
| 71 | } | 71 | } |
diff --git a/include/asm-cris/semaphore-helper.h b/include/asm-cris/semaphore-helper.h index dbd0f30b85b6..a8e1e6cb7cd0 100644 --- a/include/asm-cris/semaphore-helper.h +++ b/include/asm-cris/semaphore-helper.h | |||
| @@ -20,12 +20,12 @@ | |||
| 20 | /* | 20 | /* |
| 21 | * These two _must_ execute atomically wrt each other. | 21 | * These two _must_ execute atomically wrt each other. |
| 22 | */ | 22 | */ |
| 23 | extern inline void wake_one_more(struct semaphore * sem) | 23 | static inline void wake_one_more(struct semaphore * sem) |
| 24 | { | 24 | { |
| 25 | atomic_inc(&sem->waking); | 25 | atomic_inc(&sem->waking); |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | extern inline int waking_non_zero(struct semaphore *sem) | 28 | static inline int waking_non_zero(struct semaphore *sem) |
| 29 | { | 29 | { |
| 30 | unsigned long flags; | 30 | unsigned long flags; |
| 31 | int ret = 0; | 31 | int ret = 0; |
| @@ -40,7 +40,7 @@ extern inline int waking_non_zero(struct semaphore *sem) | |||
| 40 | return ret; | 40 | return ret; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | extern inline int waking_non_zero_interruptible(struct semaphore *sem, | 43 | static inline int waking_non_zero_interruptible(struct semaphore *sem, |
| 44 | struct task_struct *tsk) | 44 | struct task_struct *tsk) |
| 45 | { | 45 | { |
| 46 | int ret = 0; | 46 | int ret = 0; |
| @@ -59,7 +59,7 @@ extern inline int waking_non_zero_interruptible(struct semaphore *sem, | |||
| 59 | return ret; | 59 | return ret; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | extern inline int waking_non_zero_trylock(struct semaphore *sem) | 62 | static inline int waking_non_zero_trylock(struct semaphore *sem) |
| 63 | { | 63 | { |
| 64 | int ret = 1; | 64 | int ret = 1; |
| 65 | unsigned long flags; | 65 | unsigned long flags; |