Skip to content

Commit

Permalink
[PATCH] include/asm-cris/: "extern inline" -> "static inline"
Browse files Browse the repository at this point in the history
"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 <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>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Dec 7, 2006
1 parent 30aaa5c commit bb8cc64
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions include/asm-cris/arch-v10/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,7 +26,7 @@ extern inline unsigned long cris_swapnwbrlz(unsigned long w)
return 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"
Expand All @@ -40,7 +40,7 @@ extern inline unsigned long cris_swapwbrlz(unsigned long w)
* 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);
}
Expand All @@ -51,7 +51,7 @@ extern inline unsigned long ffz(unsigned long w)
*
* 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);
}
Expand All @@ -65,7 +65,7 @@ extern inline unsigned long __ffs(unsigned long word)
* 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;
}
Expand Down
8 changes: 4 additions & 4 deletions include/asm-cris/semaphore-helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -40,7 +40,7 @@ extern inline int waking_non_zero(struct semaphore *sem)
return 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;
Expand All @@ -59,7 +59,7 @@ extern inline int waking_non_zero_interruptible(struct semaphore *sem,
return 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;
Expand Down

0 comments on commit bb8cc64

Please sign in to comment.