On Sat, Jan 20, 2018 at 11:04:20AM +0200, Tuomas Tynkkynen wrote:
> Hi Greg,
>
> Please apply the following commit from 4.10 to 4.9.y to fix perf build
> under certain conditions:
>
> commit 7a759cd8e8272ee18922838ee711219c7c796a31
> Author: Jiada Wang <jiada_wang@xxxxxxxxxx>
> Date: Sun Apr 9 20:02:37 2017 -0700
>
> perf tools: Fix build with ARCH=x86_64
>
> With commit: 0a943cb10ce78 (tools build: Add HOSTARCH Makefile variable)
> when building for ARCH=x86_64, ARCH=x86_64 is passed to perf instead of
> ARCH=x86, so the perf build process searchs header files from
> tools/arch/x86_64/include, which doesn't exist.
>
> The following build failure is seen:
>
> In file included from util/event.c:2:0:
> tools/include/uapi/linux/mman.h:4:27: fatal error: uapi/asm/mman.h: No such file or directory
> compilation terminated.
>
> Fix this issue by using SRCARCH instead of ARCH in perf, just like the
> main kernel Makefile and tools/objtool's.
>
> Signed-off-by: Jiada Wang <jiada_wang@xxxxxxxxxx>
> Tested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> Cc: Eugeniu Rosca <erosca@xxxxxxxxxxxxxx>
> Cc: Jan Stancek <jstancek@xxxxxxxxxx>
> Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxxxxxxx>
> Cc: Rui Teng <rui.teng@xxxxxxxxxxxxxxxxxx>
> Cc: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx>
> Cc: Wang Nan <wangnan0@xxxxxxxxxx>
> Fixes: 0a943cb10ce7 ("tools build: Add HOSTARCH Makefile variable")
> Link: http://lkml.kernel.org/r/1491793357-14977-2-git-send-email-jiada_wang@xxxxxxxxxx
> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Now queued up, thanks.
greg k-h