diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-07-14 11:05:58 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-07-14 11:05:58 -0400 |
| commit | 147e6e851e1408fed6cc989650c1d0d23a5cb9d7 (patch) | |
| tree | dfa746752d0f1357aca611eedfcbe2b5f78122b4 /kernel | |
| parent | d106ac23769866f1631e411a4fbf2f51dd23eb9b (diff) | |
| parent | 35467dc7630af60abacc330f64029d081f160530 (diff) | |
Merge tag 'v4.4.15' into v4.4-rt
This is the 4.4.15 stable release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 2d26658817d6..560ea99875d3 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7102,7 +7102,7 @@ static void perf_event_free_bpf_prog(struct perf_event *event) prog = event->tp_event->prog; if (prog) { event->tp_event->prog = NULL; - bpf_prog_put(prog); + bpf_prog_put_rcu(prog); } } |