Commit 3497d206 authored by Thomas Gleixner's avatar Thomas Gleixner

perf: core: Use hrtimer_start()

hrtimer_start() does not longer defer already expired timers to the
softirq. Get rid of the __hrtimer_start_range_ns() invocation.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20150414203502.452104213@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 576b0704
...@@ -834,9 +834,7 @@ static void perf_cpu_hrtimer_restart(struct perf_cpu_context *cpuctx) ...@@ -834,9 +834,7 @@ static void perf_cpu_hrtimer_restart(struct perf_cpu_context *cpuctx)
if (hrtimer_active(hr)) if (hrtimer_active(hr))
return; return;
if (!hrtimer_callback_running(hr)) hrtimer_start(hr, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED);
__hrtimer_start_range_ns(hr, cpuctx->hrtimer_interval,
0, HRTIMER_MODE_REL_PINNED, 0);
} }
void perf_pmu_disable(struct pmu *pmu) void perf_pmu_disable(struct pmu *pmu)
...@@ -6843,9 +6841,8 @@ static void perf_swevent_start_hrtimer(struct perf_event *event) ...@@ -6843,9 +6841,8 @@ static void perf_swevent_start_hrtimer(struct perf_event *event)
} else { } else {
period = max_t(u64, 10000, hwc->sample_period); period = max_t(u64, 10000, hwc->sample_period);
} }
__hrtimer_start_range_ns(&hwc->hrtimer, hrtimer_start(&hwc->hrtimer, ns_to_ktime(period),
ns_to_ktime(period), 0, HRTIMER_MODE_REL_PINNED);
HRTIMER_MODE_REL_PINNED, 0);
} }
static void perf_swevent_cancel_hrtimer(struct perf_event *event) static void perf_swevent_cancel_hrtimer(struct perf_event *event)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment