diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:18:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:18:15 +0800 |
| commit | aa6b4960f4571ecc422a13b2490e91f5debb64a1 (patch) | |
| tree | 6af6af9e4c02335f7aba6cbedf2fb386ecf0a359 /kernel | |
| parent | 841eac1df7144c7ecd70ad8ea5942f12a260e845 (diff) | |
| parent | bd06e78ba67a5ba3c2f8dbf8d0b4a68ddb0fdc05 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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 968fea351a6f..662f2b23632f 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7231,7 +7231,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); } } |