Commit 491c6040 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King

[ARM PATCH] 2230/1: fix generic_fls declaration mismatch

Patch from Nicolas Pitre

The declaration of generic_fls recently changed from
extern inline to static inline.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King
parent 7303625c
...@@ -342,7 +342,7 @@ static inline unsigned long __ffs(unsigned long word) ...@@ -342,7 +342,7 @@ static inline unsigned long __ffs(unsigned long word)
* the clz instruction for much better code efficiency. * the clz instruction for much better code efficiency.
*/ */
extern __inline__ int generic_fls(int x); static __inline__ int generic_fls(int x);
#define fls(x) \ #define fls(x) \
( __builtin_constant_p(x) ? generic_fls(x) : \ ( __builtin_constant_p(x) ? generic_fls(x) : \
({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment