diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-14 01:30:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-14 01:30:04 +0300 |
| commit | 8c8f67a46f2bf33556ad12a1971734047b60831a (patch) | |
| tree | 8953ffb18b57e8b9806ae14e03771b1df2da6be5 /arch | |
| parent | f6e168b4a147e169c1df9a9fc2158b974e3195b4 (diff) | |
| parent | 9147efcbe0b7cc96b18eb64b1a3f0d4bba81443c (diff) | |
| download | linux-8c8f67a46f2bf33556ad12a1971734047b60831a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2017-12-13
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Addition of explicit scheduling points to map alloc/free
in order to avoid having to hold the CPU for too long,
from Eric.
2) Fixing of a corruption in overlapping perf_event_output
calls from different BPF prog types on the same CPU out
of different contexts, from Daniel.
3) Fallout fixes for recent correction of broken uapi for
BPF_PROG_TYPE_PERF_EVENT. um had a missing asm header
that needed to be pulled in from asm-generic and for
BPF selftests the asm-generic include did not work,
so similar asm include scheme was adapted for that
problematic header that perf is having with other
header files under tools, from Daniel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index 50a32c33d729..73c57f614c9e 100644 --- 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 |