diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-14 17:09:01 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-22 11:06:50 -0400 |
commit | 576b0704c9def6d54b3ae9e13b0b7567c713f568 (patch) | |
tree | 8e0c06557dd9ef631a347a9a5534f3d30e532e45 | |
parent | 514c2304b4574dae28c3d7c0ad6b9cf296994140 (diff) |
x86: perf: uncore: 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: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter 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>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/20150414203502.360555157@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_uncore.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index c635b8b49e93..7c411f0e58fd 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c | |||
@@ -233,9 +233,8 @@ static enum hrtimer_restart uncore_pmu_hrtimer(struct hrtimer *hrtimer) | |||
233 | 233 | ||
234 | void uncore_pmu_start_hrtimer(struct intel_uncore_box *box) | 234 | void uncore_pmu_start_hrtimer(struct intel_uncore_box *box) |
235 | { | 235 | { |
236 | __hrtimer_start_range_ns(&box->hrtimer, | 236 | hrtimer_start(&box->hrtimer, ns_to_ktime(box->hrtimer_duration), |
237 | ns_to_ktime(box->hrtimer_duration), 0, | 237 | HRTIMER_MODE_REL_PINNED); |
238 | HRTIMER_MODE_REL_PINNED, 0); | ||
239 | } | 238 | } |
240 | 239 | ||
241 | void uncore_pmu_cancel_hrtimer(struct intel_uncore_box *box) | 240 | void uncore_pmu_cancel_hrtimer(struct intel_uncore_box *box) |