From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D8091BBBD3 for ; Wed, 31 Jul 2024 15:45:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722440707; cv=none; b=P71moIT/+cO9tWRnKdy8oXh0AInou+fiB7i75LZpsGJRgvUx9E3x2IZyRMOI3ojcH83bubr9JxKFymJKyVRnWQBf4WwGIMz5+jWORz1h4BrhCqZT+xkWzgxQ+ivMT6H/eHq5IGpS+eUKbowr510ZF+0QbG1J2acMUrnu96AfTxQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722440707; c=relaxed/simple; bh=NmitiGPMipFuWRllnzeaQLIndK4WAJkGQNjENc0ekiA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uc8T5JV0S3G7BB8tZxaKHOawb/bwyz/Dnl57aw6l3V/VdYJkTuY+VZhSMiVqzZMBcm9Mnx+uL3LjdqdGQD9e/iQOrI+hshgYswk3ieSY2yGmlpKnlbw0RTMlZ6E3TNtrmpt2Da2IN4ZNaHguIg2y+X+anihRRkHuPTYm+wQVTbg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GQkEbo50; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GQkEbo50" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87B38C116B1; Wed, 31 Jul 2024 15:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722440707; bh=NmitiGPMipFuWRllnzeaQLIndK4WAJkGQNjENc0ekiA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GQkEbo50vfpnFg39DPCCCVu8nBkMqa9VM/8zapr2mIeOaEtNZkoa08Ba9H0N+A5cQ rZ7uBZ6ZA2TliCvWTeA3FaQD4stUPboUOTW3WqOqTv46WN2r6tMe6UNkQxdsTSoxKV AmT/b1/wkUZpVJte+r8GGQ07SupmI5+7ByFCnQsTTg/7cS/Y0f/jMq09SKjW9I37gA 7DqrUyIFu/qKHFgurumt7BpAy5HJx9jTGj/tQa95vXnjnCUciOzAZncoTZXU52xion +7lxa6RNL2pMkDXydELNYhAxaO6IYe0FQEv1t37Z08hsr8NtH4aTxZp+B0k5loZcrJ hCYrQJ9vtAqZw== Date: Wed, 31 Jul 2024 12:45:04 -0300 From: Arnaldo Carvalho de Melo To: Song Liu Cc: Adrian Hunter , Ian Rogers , Jiri Olsa , Kan Liang , Namhyung Kim , Linux Kernel Mailing List Subject: Re: [PATCH 1/1] perf bpf: Move BPF disassembly routines to separate file to avoid clash with capstone bpf headers Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 +#include #if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT) #define PACKAGE "perf"