3.2.78-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Thomas Gleixner <[email protected]> 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 <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Helge Deller <[email protected]> Cc: John Stultz <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]> [bwh: Backported to 3.2: adjust filename] Signed-off-by: Ben Hutchings <[email protected]> --- kernel/itimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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
