diff options
| author | Tony Lindgren <[email protected]> | 2018-11-08 09:57:42 -0800 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2018-11-08 09:57:42 -0800 |
| commit | 07fa3fa2572f2dee85beb8137f90ccf33d7206af (patch) | |
| tree | 0cec1fca7425cd6c423c53c4581ea2a9776ed411 /tools/include/linux/bitops.h | |
| parent | 4ed0dfe3cf39a97cd0ed532212b5e55e9752fe3f (diff) | |
| parent | 651022382c7f8da46cb4872a545ee1da6d097d2a (diff) | |
Merge tag 'v4.20-rc1' into omap-for-v4.21/dt-ti-sysc
Linux 4.20-rc1
Diffstat (limited to 'tools/include/linux/bitops.h')
| -rw-r--r-- | tools/include/linux/bitops.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h index acc704bd3998..0b0ef3abc966 100644 --- a/tools/include/linux/bitops.h +++ b/tools/include/linux/bitops.h @@ -3,8 +3,6 @@ #define _TOOLS_LINUX_BITOPS_H_ #include <asm/types.h> -#include <linux/compiler.h> - #ifndef __WORDSIZE #define __WORDSIZE (__SIZEOF_LONG__ * 8) #endif @@ -12,10 +10,9 @@ #ifndef BITS_PER_LONG # define BITS_PER_LONG __WORDSIZE #endif +#include <linux/bits.h> +#include <linux/compiler.h> -#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) -#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) -#define BITS_PER_BYTE 8 #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) #define BITS_TO_U64(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u64)) #define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) |