diff options
Diffstat (limited to 'scripts/include/asm-generic/bitops')
| -rw-r--r-- | scripts/include/asm-generic/bitops/__ffs.h | 3 | ||||
| -rw-r--r-- | scripts/include/asm-generic/bitops/arch_hweight.h | 1 | ||||
| -rw-r--r-- | scripts/include/asm-generic/bitops/atomic.h | 9 | ||||
| -rw-r--r-- | scripts/include/asm-generic/bitops/const_hweight.h | 1 | ||||
| -rw-r--r-- | scripts/include/asm-generic/bitops/hweight.h | 3 |
5 files changed, 8 insertions, 9 deletions
diff --git a/scripts/include/asm-generic/bitops/__ffs.h b/scripts/include/asm-generic/bitops/__ffs.h index c94175015a..15ffaa12c5 100644 --- a/scripts/include/asm-generic/bitops/__ffs.h +++ b/scripts/include/asm-generic/bitops/__ffs.h @@ -2,6 +2,7 @@ #define _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_ #include <asm/types.h> +#include <asm-generic/bitsperlong.h> /** * __ffs - find first bit in word. @@ -13,7 +14,7 @@ static __always_inline unsigned long __ffs(unsigned long word) { int num = 0; -#if __BITS_PER_LONG == 64 +#if BITS_PER_LONG == 64 if ((word & 0xffffffff) == 0) { num += 32; word >>= 32; diff --git a/scripts/include/asm-generic/bitops/arch_hweight.h b/scripts/include/asm-generic/bitops/arch_hweight.h deleted file mode 100644 index 318bb2b202..0000000000 --- a/scripts/include/asm-generic/bitops/arch_hweight.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../../include/asm-generic/bitops/arch_hweight.h" diff --git a/scripts/include/asm-generic/bitops/atomic.h b/scripts/include/asm-generic/bitops/atomic.h index 4bccd7c3d5..03fe804024 100644 --- a/scripts/include/asm-generic/bitops/atomic.h +++ b/scripts/include/asm-generic/bitops/atomic.h @@ -2,21 +2,22 @@ #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_ #include <asm/types.h> +#include <asm-generic/bitsperlong.h> static inline void set_bit(int nr, unsigned long *addr) { - addr[nr / __BITS_PER_LONG] |= 1UL << (nr % __BITS_PER_LONG); + addr[nr / BITS_PER_LONG] |= 1UL << (nr % BITS_PER_LONG); } static inline void clear_bit(int nr, unsigned long *addr) { - addr[nr / __BITS_PER_LONG] &= ~(1UL << (nr % __BITS_PER_LONG)); + addr[nr / BITS_PER_LONG] &= ~(1UL << (nr % BITS_PER_LONG)); } static __always_inline int test_bit(unsigned int nr, const unsigned long *addr) { - return ((1UL << (nr % __BITS_PER_LONG)) & - (((unsigned long *)addr)[nr / __BITS_PER_LONG])) != 0; + return ((1UL << (nr % BITS_PER_LONG)) & + (((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0; } #endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_ */ diff --git a/scripts/include/asm-generic/bitops/const_hweight.h b/scripts/include/asm-generic/bitops/const_hweight.h deleted file mode 100644 index 0afd644aff..0000000000 --- a/scripts/include/asm-generic/bitops/const_hweight.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../../include/asm-generic/bitops/const_hweight.h" diff --git a/scripts/include/asm-generic/bitops/hweight.h b/scripts/include/asm-generic/bitops/hweight.h index 290120c01a..eb95ca33d5 100644 --- a/scripts/include/asm-generic/bitops/hweight.h +++ b/scripts/include/asm-generic/bitops/hweight.h @@ -1,7 +1,6 @@ #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ -#include <asm-generic/bitops/arch_hweight.h> -#include <asm-generic/bitops/const_hweight.h> +#include "../../../../include/asm-generic/bitops/hweight.h" #endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ */ |