diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-12-06 23:40:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:45 -0500 |
| commit | bb8cc641653d785e3f3b8d3b0182a69edf825802 (patch) | |
| tree | cc79a0236ee29a076ad47d0d3c9e578e04ee088e /include/asm-cris/arch-v10 | |
| parent | 30aaa5c67e72849ccf290b9a7cad58e43bbb47ac (diff) | |
[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>
Diffstat (limited to 'include/asm-cris/arch-v10')
| -rw-r--r-- | include/asm-cris/arch-v10/bitops.h | 10 |
1 files changed, 5 insertions, 5 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 | } |