Commit e532ffea authored May 13, 2015 by Pawel Moll Committed by Arnd Bergmann May 13, 2015

bus: arm-ccn: Use hrtimer_start() again



hrtimer_start() will no longer defer already expired timers to the
softirq in 4.2, and the __hrtimer_start_range_ns() function is
getting removed, causing build errors when both the tip tree and
the arm-ccn changes are merged.

This changes the code back to using hrtimer_start, which will
do the right thing after this branch gets merged with the
timers update from tip.

As pointed out after a discussion on the mailing list, the result will
not be worse than the what was there before you pulled my updates, as
the code was using normal hrtimer_start(). It's just when I realised
that it should be pinned I looked at what x86 uncore pmu is doing and
shamelessly (and probably a bit mindlessly) copied the "do not wakeup"
version from there.

[arnd: update commit message]
Reported-by: Mark Brown <mark.brown@arm.com>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent 44fb3026

drivers/bus/arm-ccn.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -921,9 +921,8 @@ static void arm_ccn_pmu_event_start(struct perf_event *event, int flags)
		* attribute).
		*/
		if (!ccn->irq)
		__hrtimer_start_range_ns(&ccn->dt.hrtimer,
		arm_ccn_pmu_timer_period(), 0,
		HRTIMER_MODE_REL_PINNED, 0);
		hrtimer_start(&ccn->dt.hrtimer, arm_ccn_pmu_timer_period(),
		HRTIMER_MODE_REL_PINNED);

		/* Set the DT bus input, engaging the counter */
		arm_ccn_pmu_xp_dt_config(event, 1);