diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/asm-generic/bitops/fls64.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/asm-generic/bitops/fls64.h')
| -rw-r--r-- | include/asm-generic/bitops/fls64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h index 86d403f8b256..b097cf8444e3 100644 --- a/include/asm-generic/bitops/fls64.h +++ b/include/asm-generic/bitops/fls64.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * at position 64. | 15 | * at position 64. |
| 16 | */ | 16 | */ |
| 17 | #if BITS_PER_LONG == 32 | 17 | #if BITS_PER_LONG == 32 |
| 18 | static inline int fls64(__u64 x) | 18 | static __always_inline int fls64(__u64 x) |
| 19 | { | 19 | { |
| 20 | __u32 h = x >> 32; | 20 | __u32 h = x >> 32; |
| 21 | if (h) | 21 | if (h) |
| @@ -23,7 +23,7 @@ static inline int fls64(__u64 x) | |||
| 23 | return fls(x); | 23 | return fls(x); |
| 24 | } | 24 | } |
| 25 | #elif BITS_PER_LONG == 64 | 25 | #elif BITS_PER_LONG == 64 |
| 26 | static inline int fls64(__u64 x) | 26 | static __always_inline int fls64(__u64 x) |
| 27 | { | 27 | { |
| 28 | if (x == 0) | 28 | if (x == 0) |
| 29 | return 0; | 29 | return 0; |