diff options
| author | Matthew Wilcox <mawilcox@microsoft.com> | 2016-12-16 11:52:43 -0500 |
|---|---|---|
| committer | Matthew Wilcox <mawilcox@microsoft.com> | 2017-01-27 21:29:39 -0500 |
| commit | c68a2aab3300df4106f368568bd7361d6f465993 (patch) | |
| tree | deed685b65c643322a7213b16b1953b7e3b3acf9 /tools/include | |
| parent | 35534c869c62f59203c1822769bbef14e894a9e9 (diff) | |
| download | linux-c68a2aab3300df4106f368568bd7361d6f465993.tar.gz linux-c68a2aab3300df4106f368568bd7361d6f465993.tar.bz2 linux-c68a2aab3300df4106f368568bd7361d6f465993.zip | |
radix tree test suite: Remove duplicate bitops code
By adding __set_bit and __clear_bit to the tools include directory, we
can share the bitops code. This reveals an include loop between kernel.h,
log2.h, bitmap.h and bitops.h. Break it the same way as the kernel does;
by moving the kernel.h include from bitops.h to bitmap.h.
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/asm-generic/bitops/atomic.h | 3 | ||||
| -rw-r--r-- | tools/include/linux/bitmap.h | 1 | ||||
| -rw-r--r-- | tools/include/linux/bitops.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/tools/include/asm-generic/bitops/atomic.h b/tools/include/asm-generic/bitops/atomic.h index 18663f59d72f..68b8c1516c5a 100644 --- a/tools/include/asm-generic/bitops/atomic.h +++ b/tools/include/asm-generic/bitops/atomic.h @@ -20,4 +20,7 @@ static __always_inline int test_bit(unsigned int nr, const unsigned long *addr) (((unsigned long *)addr)[nr / __BITS_PER_LONG])) != 0; } +#define __set_bit(nr, addr) set_bit(nr, addr) +#define __clear_bit(nr, addr) clear_bit(nr, addr) + #endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_ */ diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index eef41d500e9e..e8b9f518e36b 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -4,6 +4,7 @@ #include <string.h> #include <linux/bitops.h> #include <stdlib.h> +#include <linux/kernel.h> #define DECLARE_BITMAP(name,bits) \ unsigned long name[BITS_TO_LONGS(bits)] diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h index fc446343ff41..1aecad369af5 100644 --- a/tools/include/linux/bitops.h +++ b/tools/include/linux/bitops.h @@ -2,7 +2,6 @@ #define _TOOLS_LINUX_BITOPS_H_ #include <asm/types.h> -#include <linux/kernel.h> #include <linux/compiler.h> #ifndef __WORDSIZE |