diff options
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/bitops_64.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/asm-x86/bitops_64.h b/include/asm-x86/bitops_64.h index a5fbe7a02a3f..d13352087191 100644 --- a/include/asm-x86/bitops_64.h +++ b/include/asm-x86/bitops_64.h | |||
@@ -39,25 +39,14 @@ static inline void set_bit_string(unsigned long *bitmap, unsigned long i, | |||
39 | 39 | ||
40 | #include <asm-generic/bitops/sched.h> | 40 | #include <asm-generic/bitops/sched.h> |
41 | 41 | ||
42 | /** | ||
43 | * fls64 - find last bit set in 64 bit word | ||
44 | * @x: the word to search | ||
45 | * | ||
46 | * This is defined the same way as fls. | ||
47 | */ | ||
48 | static inline int fls64(__u64 x) | ||
49 | { | ||
50 | if (x == 0) | ||
51 | return 0; | ||
52 | return __fls(x) + 1; | ||
53 | } | ||
54 | |||
55 | #define ARCH_HAS_FAST_MULTIPLIER 1 | 42 | #define ARCH_HAS_FAST_MULTIPLIER 1 |
56 | 43 | ||
57 | #include <asm-generic/bitops/hweight.h> | 44 | #include <asm-generic/bitops/hweight.h> |
58 | 45 | ||
59 | #endif /* __KERNEL__ */ | 46 | #endif /* __KERNEL__ */ |
60 | 47 | ||
48 | #include <asm-generic/bitops/fls64.h> | ||
49 | |||
61 | #ifdef __KERNEL__ | 50 | #ifdef __KERNEL__ |
62 | 51 | ||
63 | #include <asm-generic/bitops/ext2-non-atomic.h> | 52 | #include <asm-generic/bitops/ext2-non-atomic.h> |