diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2015-05-13 16:21:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 18:18:00 +0200 |
| commit | e532ffea4ae598d04552dd1138a2367660f6dd5e (patch) | |
| tree | dd5beec0730b4643e45db5808e0f452f8a517de2 /drivers/bus | |
| parent | 44fb3026ad28d2a2b935dc9c47ec2dffadca3f35 (diff) | |
| download | linux-e532ffea4ae598d04552dd1138a2367660f6dd5e.tar.gz linux-e532ffea4ae598d04552dd1138a2367660f6dd5e.tar.bz2 linux-e532ffea4ae598d04552dd1138a2367660f6dd5e.zip | |
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>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/arm-ccn.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index df5f307f3244..7d9879e166cf 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -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); |