The following commit has been merged into the x86/core branch of tip: Commit-ID: 0705ef64d1ff52b817e278ca6e28095585ff31e1 Gitweb: https://git.kernel.org/tip/0705ef64d1ff52b817e278ca6e28095585ff31e1 Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Wed, 17 Mar 2021 11:33:04 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 17 Mar 2021 20:17:05 +01:00 tools/insn: Restore the relative include paths for cross building Building perf on ppc causes: In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15: util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory 14 | #include <asm/inat.h> /*__ignore_sync_check__ */ | ^~~~~~~~~~~~ Restore the relative include paths so that the compiler can find the headers. Fixes: 93281c4a9657 ("x86/insn: Add an insn_decode() API") Reported-by: Ian Rogers <irogers@xxxxxxxxxx> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Tested-by: Ian Rogers <irogers@xxxxxxxxxx> Tested-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20210317150858.02b1bbc8@xxxxxxxxxxxxxxxx --- tools/arch/x86/lib/insn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c index cd4dedd..c41f958 100644 --- a/tools/arch/x86/lib/insn.c +++ b/tools/arch/x86/lib/insn.c @@ -11,13 +11,13 @@ #else #include <string.h> #endif -#include <asm/inat.h> /*__ignore_sync_check__ */ -#include <asm/insn.h> /* __ignore_sync_check__ */ +#include "../include/asm/inat.h" /* __ignore_sync_check__ */ +#include "../include/asm/insn.h" /* __ignore_sync_check__ */ #include <linux/errno.h> #include <linux/kconfig.h> -#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */ +#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */ #define leXX_to_cpu(t, r) \ ({ \
![]() |