diff options
| author | Ingo Molnar | 2018-01-30 15:08:27 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2018-01-30 15:08:27 +0100 |
| commit | 7e86548e2cc8d308cb75439480f428137151b0de (patch) | |
| tree | fa3bcdedb64f4642a21080bc2b4ddc69ce2b2285 /arch/m32r/include/uapi | |
| parent | x86/speculation: Simplify indirect_branch_prediction_barrier() (diff) | |
| parent | Linux 4.15 (diff) | |
| download | kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.gz kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.xz kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.zip | |
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r/include/uapi')
| -rw-r--r-- | arch/m32r/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 1c44d3b3eba0..451bf6071c6e 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,5 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm +generic-y += bpf_perf_event.h generic-y += kvm_para.h generic-y += siginfo.h |