Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 576b0704

kernel/events/core.c

+3 −6
Original line number Diff line number Diff line
@@ -834,9 +834,7 @@ static void perf_cpu_hrtimer_restart(struct perf_cpu_context *cpuctx) 
	if (hrtimer_active(hr))

		return;



	if (!hrtimer_callback_running(hr))

		__hrtimer_start_range_ns(hr, cpuctx->hrtimer_interval,

					 0, HRTIMER_MODE_REL_PINNED, 0);

	hrtimer_start(hr, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED);

}



void perf_pmu_disable(struct pmu *pmu)
@@ -6843,9 +6841,8 @@ static void perf_swevent_start_hrtimer(struct perf_event *event) 
	} else {

		period = max_t(u64, 10000, hwc->sample_period);

	}

	__hrtimer_start_range_ns(&hwc->hrtimer,

				ns_to_ktime(period), 0,

				HRTIMER_MODE_REL_PINNED, 0);

	hrtimer_start(&hwc->hrtimer, ns_to_ktime(period),

		      HRTIMER_MODE_REL_PINNED);

}



static void perf_swevent_cancel_hrtimer(struct perf_event *event)