diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-01-14 16:54:48 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-27 14:28:42 +0000 |
| commit | 6841a66225c4857ed74b1b1d227c1e2ac5434321 (patch) | |
| tree | 172af02fdfa3dd01028d8511bc950cbe9e8c288d /kernel | |
| parent | c7f98587dd2eea27cdfe2ba3b60983c9e9e92de9 (diff) | |
itimers: Handle relative timers with CONFIG_TIME_LOW_RES proper
commit 51cbb5242a41700a3f250ecfb48dcfb7e4375ea4 upstream.
As Helge reported for timerfd we have the same issue in itimers. We return
remaining time larger than the programmed relative time to user space in case
of CONFIG_TIME_LOW_RES=y. Use the proper function to adjust the extra time
added in hrtimer_start_range_ns().
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Helge Deller <deller@gmx.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: dhowells@redhat.com
Link: http://lkml.kernel.org/r/20160114164159.528222587@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/itimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index d802883153da..c6f948960a51 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c @@ -26,7 +26,7 @@ */ static struct timeval itimer_get_remtime(struct hrtimer *timer) { - ktime_t rem = hrtimer_get_remaining(timer); + ktime_t rem = __hrtimer_get_remaining(timer, true); /* * Racy but safe: if the itimer expires after the above |