diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:18:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:18:11 +0800 |
| commit | bd06e78ba67a5ba3c2f8dbf8d0b4a68ddb0fdc05 (patch) | |
| tree | c0f7455aec0c0c8a90b2152e401905e024c6cc8f /kernel | |
| parent | ffc4aa8f521606f63f59ff708f49780172909e94 (diff) | |
| parent | 35467dc7630af60abacc330f64029d081f160530 (diff) | |
Merge tag 'v4.4.15' into linux-linaro-lsk-v4.4
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 da75e59e6642..e2998a4444b0 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7226,7 +7226,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); } } |