From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Song Liu <song@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>,
Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@kernel.org>,
Kan Liang <kan.liang@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/1] perf bpf: Move BPF disassembly routines to separate file to avoid clash with capstone bpf headers
Date: Wed, 31 Jul 2024 12:45:04 -0300 [thread overview]
Message-ID: <ZqpcAN_-UhXJkM94@x1> (raw)
In-Reply-To: <ZqpUSKPxMwaQKORr@x1>
On Wed, Jul 31, 2024 at 12:12:10PM -0300, Arnaldo Carvalho de Melo wrote:
> There is a clash of the libbpf and capstone libraries, that ends up
> with:
So this is needed for building without BUILD_NONDISTRO=1, sry.
diff --git a/tools/perf/util/disasm_bpf.c b/tools/perf/util/disasm_bpf.c
index 14994515beb341ce..1fee71c79b624cc8 100644
--- a/tools/perf/util/disasm_bpf.c
+++ b/tools/perf/util/disasm_bpf.c
@@ -3,6 +3,8 @@
#include "util/annotate.h"
#include "util/disasm_bpf.h"
#include "util/symbol.h"
+#include <linux/zalloc.h>
+#include <string.h>
#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
#define PACKAGE "perf"
next prev parent reply other threads:[~2024-07-31 15:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 15:12 [PATCH 1/1] perf bpf: Move BPF disassembly routines to separate file to avoid clash with capstone bpf headers Arnaldo Carvalho de Melo
2024-07-31 15:45 ` Arnaldo Carvalho de Melo [this message]
2024-07-31 17:07 ` Namhyung Kim
2024-07-31 17:35 ` Ian Rogers
2024-07-31 18:49 ` Arnaldo Carvalho de Melo
2024-07-31 18:51 ` Arnaldo Carvalho de Melo
2024-08-01 15:18 ` Ian Rogers
2024-08-01 17:38 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZqpcAN_-UhXJkM94@x1 \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=song@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox