diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-19 23:29:14 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-19 23:29:13 -0800 |
| commit | d67787b7c6a3edf348ea61b10a5031e42d3abfed (patch) | |
| tree | 7ab61947ac7ec4c040b6b46e3920e212e579a39a /include/linux | |
| parent | 16f7475b49e50cde34d10497b4583701d16b1e9e (diff) | |
| parent | a486143d54295787909673dbaee6a6b6042a3377 (diff) | |
Merge "perf: Cancel the mux hrtimer during CPU hotplug to avoid migration"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f501b8c0de4e..efce166a9f17 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -231,7 +231,7 @@ struct pmu { int capabilities; int * __percpu pmu_disable_count; - struct perf_cpu_context * __percpu pmu_cpu_context; + struct perf_cpu_context __percpu *pmu_cpu_context; atomic_t exclusive_cnt; /* < 0: cpu; > 0: tsk */ int task_ctx_nr; int hrtimer_interval_ms; |