diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-03 07:04:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-03 07:04:47 -0700 |
| commit | fc86e52281ffd5c124f03de495fd52b7c67da491 (patch) | |
| tree | 9601b4c1d7f29752a50235bed2e5d3ad14c47f44 /include/linux | |
| parent | 3c586a777ba008573158f6c41e93bf2d5f646054 (diff) | |
| parent | dbad9b8f72fbdf29b2d5f4a3b6be928e02f52862 (diff) | |
Merge "Merge android-4.4@89074de (v4.4.94) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/trace_events.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 6ff6ab8534dd..2181ae5db42e 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -303,6 +303,7 @@ struct trace_event_call { int perf_refcount; struct hlist_head __percpu *perf_events; struct bpf_prog *prog; + struct perf_event *bpf_prog_owner; int (*perf_perm)(struct trace_event_call *, struct perf_event *); |