+ Ian. On Wed, Mar 17, 2021 at 03:08:58PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the tip tree, today's linux-next build (native perf) > failed like this: > > 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__ */ > | ^~~~~~~~~~~~ > > This is a powerpc build of perf. I can't see what caused this failure, > so I have used the version of the tip tree from next-20210316 for today. Yah, this has come up in the past during review but the wrong version somehow snuck in, sorry. ;-\ Can you guys verify this fixes the build issue? I don't have a ppc build setup. Thx. --- >From 50d91054fc421e2a90923706d5ca79e941e28300 Mon Sep 17 00:00:00 2001 From: Borislav Petkov <bp@xxxxxxx> Date: Wed, 17 Mar 2021 11:33:04 +0100 Subject: [PATCH] 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> NOT-Signed-off-by: Borislav Petkov <bp@xxxxxxx> --- tools/arch/x86/lib/insn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c index cd4dedde3265..999fbd4c9bea 100644 --- a/tools/arch/x86/lib/insn.c +++ b/tools/arch/x86/lib/insn.c @@ -11,8 +11,8 @@ #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> -- 2.29.2 -- Regards/Gruss, Boris. SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg