pahole: use btf.h directly from libbpf

anakryiko · acmel · commit ca86e9416b8b · 2019-02-11T12:57:06.000-03:00
Now that libbpf is a submodule, we don't need to copy/paste btf.h header
with BTF type definitions.

This is a first step in migrating parts of libbtf, btf_encoder and
btf_loader to use libbpf and starting to use btf__dedup().

Signed-off-by: Andrii Nakryiko &lt;andriin@fb.com&gt;
Cc: Alexei Starovoitov &lt;ast@fb.com&gt;
Cc: Martin KaFai Lau &lt;kafai@fb.com&gt;
Cc: Yonghong Song &lt;yhs@fb.com&gt;
Cc: dwarves@vger.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo &lt;acme@redhat.com&gt;
diff --git a/btf.h b/btf.h
diff --git a/btf_encoder.c b/btf_encoder.c
@@ -11,7 +11,7 @@
 
 #include "dwarves.h"
 #include "libbtf.h"
-#include "btf.h"
+#include "lib/bpf/include/uapi/linux/btf.h"
 #include "hash.h"
 #include "elf_symtab.h"
 #include "btf_encoder.h"
diff --git a/btf_loader.c b/btf_loader.c
@@ -25,7 +25,7 @@
 #include <gelf.h>
 
 #include "libbtf.h"
-#include "btf.h"
+#include "lib/bpf/include/uapi/linux/btf.h"
 #include "dutil.h"
 #include "dwarves.h"
 
diff --git a/libbtf.c b/libbtf.c
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 
 #include "libbtf.h"
-#include "btf.h"
+#include "lib/bpf/include/uapi/linux/btf.h"
 #include "dutil.h"
 #include "gobuffer.h"
 #include "dwarves.h"
