[PATCH] include/asm-cris/: "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 <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>
This commit is contained in:
parent
30aaa5c67e
commit
bb8cc64165
2 changed files with 9 additions and 9 deletions
|
@ -10,7 +10,7 @@
|
||||||
* number. They differ in that the first function also inverts all bits
|
* number. They differ in that the first function also inverts all bits
|
||||||
* in the input.
|
* 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
|
/* 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
|
input. Saying we clobber the input but can return the result
|
||||||
|
@ -26,7 +26,7 @@ extern inline unsigned long cris_swapnwbrlz(unsigned long w)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline unsigned long cris_swapwbrlz(unsigned long w)
|
static inline unsigned long cris_swapwbrlz(unsigned long w)
|
||||||
{
|
{
|
||||||
unsigned res;
|
unsigned res;
|
||||||
__asm__ ("swapwbr %0 \n\t"
|
__asm__ ("swapwbr %0 \n\t"
|
||||||
|
@ -40,7 +40,7 @@ extern inline unsigned long cris_swapwbrlz(unsigned long w)
|
||||||
* ffz = Find First Zero in word. Undefined if no zero exists,
|
* ffz = Find First Zero in word. Undefined if no zero exists,
|
||||||
* so code should check against ~0UL first..
|
* 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);
|
return cris_swapnwbrlz(w);
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ extern inline unsigned long ffz(unsigned long w)
|
||||||
*
|
*
|
||||||
* Undefined if no bit exists, so code should check against 0 first.
|
* 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);
|
return cris_swapnwbrlz(~word);
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ extern inline unsigned long __ffs(unsigned long word)
|
||||||
* differs in spirit from the above ffz (man ffs).
|
* 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;
|
return w ? cris_swapwbrlz (w) + 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,12 +20,12 @@
|
||||||
/*
|
/*
|
||||||
* These two _must_ execute atomically wrt each other.
|
* 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);
|
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;
|
unsigned long flags;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -40,7 +40,7 @@ extern inline int waking_non_zero(struct semaphore *sem)
|
||||||
return ret;
|
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)
|
struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -59,7 +59,7 @@ extern inline int waking_non_zero_interruptible(struct semaphore *sem,
|
||||||
return ret;
|
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;
|
int ret = 1;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
Loading…
Reference in a new issue