summaryrefslogtreecommitdiffstats
path: root/tools/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-01-06 12:07:10 +0100
committerIngo Molnar <mingo@kernel.org>2018-01-06 12:07:10 +0100
commitb6815f354518591400ce4c3a5fd63337643710ff (patch)
tree14f8a117b4556f7dba5a5a9ccebc5e3b204cbd56 /tools/arch
parenta0a8f2ada3f50f0190ebcbb60e77e697444c470e (diff)
parent89876f275e8d562912d9c238cd888b52065cf25c (diff)
downloadlinux-b6815f354518591400ce4c3a5fd63337643710ff.tar.gz
linux-b6815f354518591400ce4c3a5fd63337643710ff.tar.bz2
linux-b6815f354518591400ce4c3a5fd63337643710ff.zip
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/arch')
-rw-r--r--tools/arch/s390/include/uapi/asm/bpf_perf_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/arch/s390/include/uapi/asm/bpf_perf_event.h b/tools/arch/s390/include/uapi/asm/bpf_perf_event.h
index cefe7c7cd4f6..0a8e37a519f2 100644
--- a/tools/arch/s390/include/uapi/asm/bpf_perf_event.h
+++ b/tools/arch/s390/include/uapi/asm/bpf_perf_event.h
@@ -2,7 +2,7 @@
#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
#define _UAPI__ASM_BPF_PERF_EVENT_H__
-#include <asm/ptrace.h>
+#include "ptrace.h"
typedef user_pt_regs bpf_user_pt_regs_t;