diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 14:47:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 14:47:24 -0500 |
| commit | e7c632fc479a8ac28da19252d44b0bd90a2638f6 (patch) | |
| tree | a3c53ae200192b6931e00a52127afdd49c84a6a5 /tools/arch | |
| parent | 88fa025d30ea97a2aae6394794bdfc31dc9423b7 (diff) | |
| parent | 7ad1437d6ace0e450a6c1167720608ad660b191d (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
- plug a memory leak in the intel pmu init code
- clang fixes
- tooling fix to avoid including kernel headers
- a fix for jvmti to generate correct debug information for inlined
code
- replace backtick with a regular shell function
- fix the build in hardened environments
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Plug memory leak in intel_pmu_init()
x86/asm: Allow again using asm.h when building for the 'bpf' clang target
tools arch s390: Do not include header files from the kernel sources
perf jvmti: Generate correct debug information for inlined code
perf tools: Fix up build in hardened environments
perf tools: Use shell function for perl cflags retrieval
Diffstat (limited to 'tools/arch')
| -rw-r--r-- | tools/arch/s390/include/uapi/asm/perf_regs.h | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/tools/arch/s390/include/uapi/asm/perf_regs.h b/tools/arch/s390/include/uapi/asm/perf_regs.h new file mode 100644 index 000000000000..d17dd9e5d516 --- /dev/null +++ b/tools/arch/s390/include/uapi/asm/perf_regs.h | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | #ifndef _ASM_S390_PERF_REGS_H | ||
| 3 | #define _ASM_S390_PERF_REGS_H | ||
| 4 | |||
| 5 | enum perf_event_s390_regs { | ||
| 6 | PERF_REG_S390_R0, | ||
| 7 | PERF_REG_S390_R1, | ||
| 8 | PERF_REG_S390_R2, | ||
| 9 | PERF_REG_S390_R3, | ||
| 10 | PERF_REG_S390_R4, | ||
| 11 | PERF_REG_S390_R5, | ||
| 12 | PERF_REG_S390_R6, | ||
| 13 | PERF_REG_S390_R7, | ||
| 14 | PERF_REG_S390_R8, | ||
| 15 | PERF_REG_S390_R9, | ||
| 16 | PERF_REG_S390_R10, | ||
| 17 | PERF_REG_S390_R11, | ||
| 18 | PERF_REG_S390_R12, | ||
| 19 | PERF_REG_S390_R13, | ||
| 20 | PERF_REG_S390_R14, | ||
| 21 | PERF_REG_S390_R15, | ||
| 22 | PERF_REG_S390_FP0, | ||
| 23 | PERF_REG_S390_FP1, | ||
| 24 | PERF_REG_S390_FP2, | ||
| 25 | PERF_REG_S390_FP3, | ||
| 26 | PERF_REG_S390_FP4, | ||
| 27 | PERF_REG_S390_FP5, | ||
| 28 | PERF_REG_S390_FP6, | ||
| 29 | PERF_REG_S390_FP7, | ||
| 30 | PERF_REG_S390_FP8, | ||
| 31 | PERF_REG_S390_FP9, | ||
| 32 | PERF_REG_S390_FP10, | ||
| 33 | PERF_REG_S390_FP11, | ||
| 34 | PERF_REG_S390_FP12, | ||
| 35 | PERF_REG_S390_FP13, | ||
| 36 | PERF_REG_S390_FP14, | ||
| 37 | PERF_REG_S390_FP15, | ||
| 38 | PERF_REG_S390_MASK, | ||
| 39 | PERF_REG_S390_PC, | ||
| 40 | |||
| 41 | PERF_REG_S390_MAX | ||
| 42 | }; | ||
| 43 | |||
| 44 | #endif /* _ASM_S390_PERF_REGS_H */ | ||
