From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Tue, 20 Oct 2020 18:48:23 +0000 (-0300)
Subject: perf annotate: Move bpf header inclusion to inside HAVE_LIBBPF_SUPPORT
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=20e88c6076fc50ebf0560e730349000ff2da94fd;p=linux.git

perf annotate: Move bpf header inclusion to inside HAVE_LIBBPF_SUPPORT

No need to include it otherwise.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index e52053a6ad425..ce8c07bc8c562 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -10,10 +10,6 @@
 #include <inttypes.h>
 #include <libgen.h>
 #include <stdlib.h>
-#include <bpf/bpf.h>
-#include <bpf/btf.h>
-#include <bpf/libbpf.h>
-#include <linux/btf.h>
 #include "util.h" // hex_width()
 #include "ui/ui.h"
 #include "sort.h"
@@ -1684,6 +1680,10 @@ fallback:
 #define PACKAGE "perf"
 #include <bfd.h>
 #include <dis-asm.h>
+#include <bpf/bpf.h>
+#include <bpf/btf.h>
+#include <bpf/libbpf.h>
+#include <linux/btf.h>
 
 static int symbol__disassemble_bpf(struct symbol *sym,
 				   struct annotate_args *args)