include/asm-cris/: parisc: "extern inline" -> "static inline"
PATCH 1/1 include/asm-cris/: parisc: "extern inline" -> "static inline"
"extern inline" generates a warning with -Wmissing-prototypes and I'm currently working on getting the kernel cleaned up for adding this to the CFLAGS since it will help us to avoid a nasty class of runtime errors.
If there are places that really need a forced inline, __always_inline would be the correct solution.
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 22 Nov 2006
include/asm-cris/arch-v10/bitops.h | 10 +++++----- include/asm-cris/semaphore-helper.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-)
include/asm-cris/arch-v10/bitops.h renamed from include/asm-cris/arch-v10/bitops.h.old +5 -5
@@ -10,7 +10,7 @@* number. They differ in that the first function also inverts all bits * in the input. */ -extern inline unsigned long cris_swapnwbrlz (unsigned long w) +static inline unsigned long cris_swapnwbrlz (unsigned long w) {/* Let's just say we return the result in the same register as the input. Saying we clobber the input but can return the result
@@ -26,7 +26,7 @@ extern inline unsigned long cris_swapnwbreturn res; } -extern inline unsigned long cris_swapwbrlz (unsigned long w) +static inline unsigned long cris_swapwbrlz (unsigned long w) {unsigned res; __asm__ ("swapwbr %0 \n\t"
@@ -40,7 +40,7 @@ extern inline unsigned long cris_swapwbr* ffz = Find First Zero in word. Undefined if no zero exists, * so code should check against ~0UL first.. */ -extern inline unsigned long ffz (unsigned long w) +static inline unsigned long ffz (unsigned long w) {return cris_swapnwbrlz (w); }
@@ -51,7 +51,7 @@ extern inline unsigned long ffz(unsigned* * Undefined if no bit exists, so code should check against 0 first. */ -extern inline unsigned long __ffs (unsigned long word) +static inline unsigned long __ffs (unsigned long word) {return cris_swapnwbrlz (~word); }
@@ -65,7 +65,7 @@ extern inline unsigned long __ffs(unsign* differs in spirit from the above ffz (man ffs). */ -extern inline unsigned long kernel_ffs (unsigned long w) +static inline unsigned long kernel_ffs (unsigned long w) {return w ?cris_swapwbrlz (w) +1 :0 ; }
include/asm-cris/semaphore-helper.h renamed from include/asm-cris/semaphore-helper.h.old +4 -4
@@ -20,12 +20,12 @@/* * These two _must_ execute atomically wrt each other. */ -extern inline void wake_one_more (struct semaphore * sem) +static inline void wake_one_more (struct semaphore * sem) {atomic_inc (&sem->waking); } -extern inline int waking_non_zero (struct semaphore *sem) +static inline int waking_non_zero (struct semaphore *sem) {unsigned long flags;int ret =0 ;
@@ -40,7 +40,7 @@ extern inline int waking_non_zero(structreturn ret; } -extern inline int waking_non_zero_interruptible (struct semaphore *sem, +static inline int waking_non_zero_interruptible (struct semaphore *sem,struct task_struct *tsk) {int ret =0 ;
@@ -59,7 +59,7 @@ extern inline int waking_non_zero_interrreturn ret; } -extern inline int waking_non_zero_trylock (struct semaphore *sem) +static inline int waking_non_zero_trylock (struct semaphore *sem) {int ret =1 ;unsigned long flags;