diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-15 10:58:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-15 10:58:32 -0800 |
| commit | 10589a568f2ec531975504c98c1bed88c233a63d (patch) | |
| tree | f2e986932c85bdbb5c1531fdd890b9f05664cf50 /arch/powerpc/include/asm/perf_event.h | |
| parent | 143ece654f9f5b37bedea252a990be37e48ae3a5 (diff) | |
| parent | 7640ead939247e91e84b7ec6ec001f30193cc7df (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2018-12-15
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix liveness propagation of callee saved registers, from Jakub.
2) fix overflow in bpf_jit_limit knob, from Daniel.
3) bpf_flow_dissector api fix, from Stanislav.
4) bpf_perf_event api fix on powerpc, from Sandipan.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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). |