diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-08 00:22:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-08 00:22:51 +0300 |
| commit | 195bd525d5f6e338b948d9a6b25bfaae86291353 (patch) | |
| tree | 61777885d9e7d4edceced7214deb301e9ec0e1fa /arch/sh | |
| parent | a4abd7a80addb4a9547f7dfc7812566b60ec505c (diff) | |
| parent | 037776e4c667a658616a9ea63d792874328c5fba (diff) | |
| download | linux-195bd525d5f6e338b948d9a6b25bfaae86291353.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2017-12-06
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fixing broken uapi for BPF tracing programs for s390 and arm64
architectures due to pt_regs being in-kernel only, and not part
of uapi right now. A wrapper is added that exports pt_regs in
an asm-generic way. For arm64 this maps to existing user_pt_regs
structure and for s390 a user_pt_regs structure exporting the
beginning of pt_regs is added and uapi-exported, thus fixing the
BPF issues seen in perf (and BPF selftests), all from Hendrik.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index e28531333efa..ba4d39cb321d 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -2,6 +2,7 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += bitsperlong.h +generic-y += bpf_perf_event.h generic-y += errno.h generic-y += fcntl.h generic-y += ioctl.h |