[PATCH bpf-next] libbpf: Include linux/log2.h to use is_pow_of_2()

From: Tiezhu Yang
Date: Mon Jun 20 2022 - 03:59:17 EST


is_pow_of_2() is already defined in tools/include/linux/log2.h [1],
so no need to define it again in tools/lib/bpf/libbpf_internal.h,
just include linux/log2.h directly.

[1] https://lore.kernel.org/bpf/20220619171248.GC3362@bug/

Suggested-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
---
tools/lib/bpf/libbpf_internal.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h
index a1ad145..021946a 100644
--- a/tools/lib/bpf/libbpf_internal.h
+++ b/tools/lib/bpf/libbpf_internal.h
@@ -13,6 +13,7 @@
#include <limits.h>
#include <errno.h>
#include <linux/err.h>
+#include <linux/log2.h>
#include <fcntl.h>
#include <unistd.h>
#include "libbpf_legacy.h"
@@ -582,9 +583,4 @@ struct bpf_link * usdt_manager_attach_usdt(struct usdt_manager *man,
const char *usdt_provider, const char *usdt_name,
__u64 usdt_cookie);

-static inline bool is_pow_of_2(size_t x)
-{
- return x && (x & (x - 1)) == 0;
-}
-
#endif /* __LIBBPF_LIBBPF_INTERNAL_H */
--
2.1.0