diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-12 15:25:54 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-12 15:25:54 +0300 |
| commit | 76523de61993d015f7895d06deacd3fd454574a1 (patch) | |
| tree | 7b2890ac9733c55ff73c72bba7b6b5c788ba925b /arch/unicore32 | |
| parent | e7ed9d9bd0375c74fe6e27d8bc73d3c6f4c8c3bc (diff) | |
| parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
| download | linux-76523de61993d015f7895d06deacd3fd454574a1.tar.xz | |
Merge tag 'v4.15-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 759a71411169..8611ef980554 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += auxvec.h generic-y += bitsperlong.h +generic-y += bpf_perf_event.h generic-y += errno.h generic-y += fcntl.h generic-y += ioctl.h |