3.2.78-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Thomas Gleixner <[email protected]> commit b62526ed11a1fe3861ab98d40b7fdab8981d788a upstream. Helge reported that a relative timer can return a remaining time larger than the programmed relative time on parisc and other architectures which have CONFIG_TIME_LOW_RES set. This happens because we add a jiffie to the resulting expiry time to prevent short timeouts. Use the new function hrtimer_expires_remaining_adjusted() to calculate the remaining time. It takes that extra added time into account for relative timers. Reported-and-tested-by: Helge Deller <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Peter Zijlstra <[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 context] Signed-off-by: Ben Hutchings <[email protected]> --- fs/timerfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -123,7 +123,7 @@ static ktime_t timerfd_get_remaining(str { ktime_t remaining; - remaining = hrtimer_expires_remaining(&ctx->tmr); + remaining = hrtimer_expires_remaining_adjusted(&ctx->tmr); return remaining.tv64 < 0 ? ktime_set(0, 0): remaining; }
