diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /include/asm-alpha/bitops.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'include/asm-alpha/bitops.h')
| -rw-r--r-- | include/asm-alpha/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index 578ed3f1a607..302201f1a097 100644 --- a/include/asm-alpha/bitops.h +++ b/include/asm-alpha/bitops.h | |||
| @@ -321,6 +321,7 @@ static inline int fls(int word) | |||
| 321 | #else | 321 | #else |
| 322 | #define fls generic_fls | 322 | #define fls generic_fls |
| 323 | #endif | 323 | #endif |
| 324 | #define fls64 generic_fls64 | ||
| 324 | 325 | ||
| 325 | /* Compute powers of two for the given integer. */ | 326 | /* Compute powers of two for the given integer. */ |
| 326 | static inline long floor_log2(unsigned long word) | 327 | static inline long floor_log2(unsigned long word) |