summaryrefslogtreecommitdiffstats
path: root/tools/perf/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-12-18 18:13:00 +0100
committerIngo Molnar <mingo@kernel.org>2017-12-18 18:13:00 +0100
commitfaaf95677f33dac910b6cbe917cabea43c8c1616 (patch)
tree4c3545259db753727b3d7208ab0b80fcc5dd6da3 /tools/perf/arch
parent1d2a7de8e907a0c7e271a914e4bf54fedb7454a6 (diff)
parent2e36463525b8b63b32be0721d0268e336d314b38 (diff)
downloadlinux-faaf95677f33dac910b6cbe917cabea43c8c1616.tar.bz2
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch')
-rw-r--r--tools/perf/arch/s390/include/perf_regs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/s390/include/perf_regs.h b/tools/perf/arch/s390/include/perf_regs.h
index d2df54a6bc5a..bcfbaed78cc2 100644
--- a/tools/perf/arch/s390/include/perf_regs.h
+++ b/tools/perf/arch/s390/include/perf_regs.h
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <linux/types.h>
-#include <../../../../arch/s390/include/uapi/asm/perf_regs.h>
+#include <asm/perf_regs.h>
void perf_regs_load(u64 *regs);