git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
asm-arm
/
bitops.h
diff --git
a/include/asm-arm/bitops.h
b/include/asm-arm/bitops.h
index
5f1c975
..
994e0ae
100644
(file)
--- a/
include/asm-arm/bitops.h
+++ b/
include/asm-arm/bitops.h
@@
-345,7
+345,7
@@
static inline unsigned long __ffs(unsigned long word)
extern __inline__ int generic_fls(int x);
#define fls(x) \
( __builtin_constant_p(x) ? generic_fls(x) : \
extern __inline__ int generic_fls(int x);
#define fls(x) \
( __builtin_constant_p(x) ? generic_fls(x) : \
- ({ int __r; asm("clz
%?\t%0, %1" : "=r"(__r) : "r"(x)
); 32-__r; }) )
+ ({ int __r; asm("clz
\t%0, %1" : "=r"(__r) : "r"(x) : "cc"
); 32-__r; }) )
#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
#define __ffs(x) (ffs(x) - 1)
#define ffz(x) __ffs( ~(x) )
#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
#define __ffs(x) (ffs(x) - 1)
#define ffz(x) __ffs( ~(x) )