diff options
| author | James Morris <james.morris@microsoft.com> | 2018-12-17 20:24:28 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-17 20:24:28 +0100 |
| commit | 8bd8ea195f6d135a8d85201116314eb5237ad7e7 (patch) | |
| tree | 3ef99e468f0b4b13cc11002aa60c4451e326191b /arch/powerpc/include/asm/perf_event.h | |
| parent | security: fs: make inode explicitly non-modular (diff) | |
| parent | Linux 4.20-rc7 (diff) | |
| download | linux-8bd8ea195f6d135a8d85201116314eb5237ad7e7.tar.xz linux-8bd8ea195f6d135a8d85201116314eb5237ad7e7.zip | |
Merge tag 'v4.20-rc7' into next-general
Sync with Linux 4.20-rc7, to pick up: Revert "ovl: relax permission checking on underlying layers"
Diffstat (limited to 'arch/powerpc/include/asm/perf_event.h')
| -rw-r--r-- | arch/powerpc/include/asm/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h index 8bf1b6351716..16a49819da9a 100644 --- a/arch/powerpc/include/asm/perf_event.h +++ b/arch/powerpc/include/asm/perf_event.h @@ -26,6 +26,8 @@ #include <asm/ptrace.h> #include <asm/reg.h> +#define perf_arch_bpf_user_pt_regs(regs) ®s->user_regs + /* * Overload regs->result to specify whether we should use the MSR (result * is zero) or the SIAR (result is non zero). |