Re: [FIX] perf tools broken for s/390

From: Heiko Carstens
Date: Wed Nov 29 2017 - 04:17:22 EST


On Tue, Nov 28, 2017 at 11:46:11AM -0300, Arnaldo Carvalho de Melo wrote:
> Hi,
>
> While preparing a pull request to Ingo for this merge window, I
> noticed a regression in one of my cross build containers, specifically:
>
> ubuntu:16.04-x-s390: FAIL
>
> LINK /tmp/build/perf/plugin_jbd2.so
> In file included from util/perf_regs.h:27:0,
> from util/event.h:11,
> from util/symbol.h:16,
> from util/block-range.h:5,
> from util/block-range.c:2:
> /git/linux/tools/perf/arch/s390/include/perf_regs.h:6:62: fatal error: ../../../../arch/s390/include/uapi/asm/perf_regs.h: No such file or directory
> compilation terminated.
> In file included from util/perf_regs.h:27:0,
> from util/event.h:11,
> from util/symbol.h:16,
> from util/sort.h:12,
> from util/annotate.c:14:
> /git/linux/tools/perf/arch/s390/include/perf_regs.h:6:62: fatal error: ../../../../arch/s390/include/uapi/asm/perf_regs.h: No such file or directory
> compilation terminated.

...

> +#ifndef ARCH_PERF_REGS_H
> +#define ARCH_PERF_REGS_H
> +
> +#include <stdlib.h>
> +#include <linux/types.h>
> +#include <../../../../arch/s390/include/uapi/asm/perf_regs.h>
>
> ------------------------------------------
>
> That will try to include a file from the kernel sources, directly,
> something we long decided to be verbotten to avoid disturbing kernel
> development (and perf's and other tools/) when, say, a kernel hacker
> adds something, tests everything but tools/ and have tools/ build
> broken.

...

Sorry about that, and thanks for fixing it!

> In the future, please send patches that touch tools/perf/ to me,
>
> The resulting patch is at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/commit/?h=perf/urgent&id=12507d0fc07ce2fa6ccdcdde819f26c4acb0d839

Will do. Thanks!