Don't include libbpf_internal.h as it is unused and has conflicting definitions, for example, with tools/perf/util/debug.h. Fix a non-glibc include path. Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx> --- tools/lib/bpf/hashmap.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h index bae8879cdf58..d5ef212a55ba 100644 --- a/tools/lib/bpf/hashmap.h +++ b/tools/lib/bpf/hashmap.h @@ -13,9 +13,8 @@ #ifdef __GLIBC__ #include <bits/wordsize.h> #else -#include <bits/reg.h> +#include <linux/bitops.h> #endif -#include "libbpf_internal.h" static inline size_t hash_bits(size_t h, int bits) { -- 2.26.2.526.g744177e7f7-goog