diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-05 13:11:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-05 13:11:04 -0700 |
| commit | a2c5ca327b447828300e9ffde4b7fb0a81223957 (patch) | |
| tree | 10fdf84404308a4ec4ef16848ed85e894c63d8c1 /kernel | |
| parent | 53eacca70d06c9410779ce3e1e705953fa8ba6fb (diff) | |
| parent | 0748a0e20318c4c5f7807f745e56c6256d6172cd (diff) | |
Merge "Merge android-4.4.190 (ac7fbca) into msm-4.4"
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 bc33e20db315..1d065a82610d 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8986,7 +8986,7 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu, goto err_free; } - perf_install_in_context(ctx, event, cpu); + perf_install_in_context(ctx, event, event->cpu); perf_unpin_context(ctx); mutex_unlock(&ctx->mutex); |