Commit 438363c0 authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov

tools/bpf: use proper type and uapi perf_event.h header for libbpf

Use __u32 instead u32 in libbpf.c and also use
uapi perf_event.h instead of tools/perf/perf-sys.h.
Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent a0f99e67
...@@ -69,7 +69,7 @@ FEATURE_USER = .libbpf ...@@ -69,7 +69,7 @@ FEATURE_USER = .libbpf
FEATURE_TESTS = libelf libelf-mmap bpf reallocarray FEATURE_TESTS = libelf libelf-mmap bpf reallocarray
FEATURE_DISPLAY = libelf bpf FEATURE_DISPLAY = libelf bpf
INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi -I$(srctree)/tools/perf INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES) FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)
check_feat := 1 check_feat := 1
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <perf-sys.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -27,6 +26,7 @@ ...@@ -27,6 +26,7 @@
#include <linux/btf.h> #include <linux/btf.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/perf_event.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/vfs.h> #include <sys/vfs.h>
...@@ -169,7 +169,7 @@ static LIST_HEAD(bpf_objects_list); ...@@ -169,7 +169,7 @@ static LIST_HEAD(bpf_objects_list);
struct bpf_object { struct bpf_object {
char license[64]; char license[64];
u32 kern_version; __u32 kern_version;
struct bpf_program *programs; struct bpf_program *programs;
size_t nr_programs; size_t nr_programs;
...@@ -540,7 +540,7 @@ static int ...@@ -540,7 +540,7 @@ static int
bpf_object__init_kversion(struct bpf_object *obj, bpf_object__init_kversion(struct bpf_object *obj,
void *data, size_t size) void *data, size_t size)
{ {
u32 kver; __u32 kver;
if (size != sizeof(kver)) { if (size != sizeof(kver)) {
pr_warning("invalid kver section in %s\n", obj->path); pr_warning("invalid kver section in %s\n", obj->path);
...@@ -1295,7 +1295,7 @@ static int bpf_object__collect_reloc(struct bpf_object *obj) ...@@ -1295,7 +1295,7 @@ static int bpf_object__collect_reloc(struct bpf_object *obj)
static int static int
load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type, load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,
const char *name, struct bpf_insn *insns, int insns_cnt, const char *name, struct bpf_insn *insns, int insns_cnt,
char *license, u32 kern_version, int *pfd, int prog_ifindex) char *license, __u32 kern_version, int *pfd, int prog_ifindex)
{ {
struct bpf_load_program_attr load_attr; struct bpf_load_program_attr load_attr;
char *cp, errmsg[STRERR_BUFSIZE]; char *cp, errmsg[STRERR_BUFSIZE];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment