lkml.org 
[lkml]   [2017]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 070/159] bpf: fix build issues on um due to mising bpf_perf_event.h
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Daniel Borkmann <daniel@iogearbox.net>

    commit ab95477e7cb35557ecfc837687007b646bab9a9f upstream.

    [ Note, this is a Git cherry-pick of the following commit:

    a23f06f06dbe ("bpf: fix build issues on um due to mising bpf_perf_event.h")

    ... for easier x86 PTI code testing and back-porting. ]

    Since c895f6f703ad ("bpf: correct broken uapi for
    BPF_PROG_TYPE_PERF_EVENT program type") um (uml) won't build
    on i386 or x86_64:

    [...]
    CC init/main.o
    In file included from ../include/linux/perf_event.h:18:0,
    from ../include/linux/trace_events.h:10,
    from ../include/trace/syscall.h:7,
    from ../include/linux/syscalls.h:82,
    from ../init/main.c:20:
    ../include/uapi/linux/bpf_perf_event.h:11:32: fatal error:
    asm/bpf_perf_event.h: No such file or directory #include
    <asm/bpf_perf_event.h>
    [...]

    Lets add missing bpf_perf_event.h also to um arch. This seems
    to be the only one still missing.

    Fixes: c895f6f703ad ("bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type")
    Reported-by: Randy Dunlap <rdunlap@infradead.org>
    Suggested-by: Richard Weinberger <richard@sigma-star.at>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Tested-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
    Cc: Richard Weinberger <richard@sigma-star.at>
    Acked-by: Alexei Starovoitov <ast@kernel.org>
    Acked-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/um/include/asm/Kbuild | 1 +
    1 file changed, 1 insertion(+)

    --- a/arch/um/include/asm/Kbuild
    +++ b/arch/um/include/asm/Kbuild
    @@ -1,4 +1,5 @@
    generic-y += barrier.h
    +generic-y += bpf_perf_event.h
    generic-y += bug.h
    generic-y += clkdev.h
    generic-y += current.h

    \
     
     \ /
      Last update: 2017-12-22 10:44    [W:4.054 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site