diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-27 23:38:53 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 23:38:53 -0400 |
| commit | 4542437679de448de0f75bc901dab380d6a5bc5b (patch) | |
| tree | 1a436c9b6f9459c3938e2bb1ab7ad2c888d0003c /include/asm-arm/bitops.h | |
| parent | 2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge in v2.6.14 by hand
Diffstat (limited to 'include/asm-arm/bitops.h')
| -rw-r--r-- | include/asm-arm/bitops.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h index aad7aad026b3..e007dd990da5 100644 --- a/include/asm-arm/bitops.h +++ b/include/asm-arm/bitops.h | |||
| @@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word) | |||
| 347 | * the clz instruction for much better code efficiency. | 347 | * the clz instruction for much better code efficiency. |
| 348 | */ | 348 | */ |
| 349 | 349 | ||
| 350 | static __inline__ int generic_fls(int x); | ||
| 351 | #define fls(x) \ | 350 | #define fls(x) \ |
| 352 | ( __builtin_constant_p(x) ? generic_fls(x) : \ | 351 | ( __builtin_constant_p(x) ? generic_fls(x) : \ |
| 353 | ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) | 352 | ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) |