Messages in this thread | | | Date | Wed, 22 Apr 2015 17:12:04 +0200 (CEST) | From | Thomas Gleixner <> | Subject | Re: [PATCH 3/3] perf: Fix mux_interval hrtimer wreckage |
| |
On Wed, 15 Apr 2015, Peter Zijlstra wrote: > -static void perf_cpu_hrtimer_restart(struct perf_cpu_context *cpuctx) > +static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx) > { > - struct hrtimer *hr = &cpuctx->hrtimer; > + struct hrtimer *timer = &cpuctx->hrtimer; > struct pmu *pmu = cpuctx->ctx.pmu; > > /* not for SW PMU */ > if (pmu->task_ctx_nr == perf_sw_context) > - return; > + return 0; > > - if (hrtimer_active(hr)) > - return; > + if (hrtimer_is_queued(timer)) > + return 0; > > - hrtimer_start(hr, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED); > + hrtimer_start(timer, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED);
return 0;
> }
I fixed it up when applying it.
Thanks,
tglx
| |