summaryrefslogtreecommitdiffstats
path: root/fs/timerfd.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-01-14 16:54:46 +0000
committerThomas Gleixner <tglx@linutronix.de>2016-01-17 11:13:55 +0100
commitb62526ed11a1fe3861ab98d40b7fdab8981d788a (patch)
treed6f8610323339659ebab14d9ca53c075597224fe /fs/timerfd.c
parent203cbf77de59fc8f13502dcfd11350c6d4a5c95f (diff)
downloadlinux-b62526ed11a1fe3861ab98d40b7fdab8981d788a.tar.gz
linux-b62526ed11a1fe3861ab98d40b7fdab8981d788a.tar.bz2
linux-b62526ed11a1fe3861ab98d40b7fdab8981d788a.zip
timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper
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 <deller@gmx.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: John Stultz <john.stultz@linaro.org> Cc: linux-m68k@lists.linux-m68k.org Cc: dhowells@redhat.com Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20160114164159.354500742@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/timerfd.c')
-rw-r--r--fs/timerfd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c
index b94fa6c3c6eb..053818dd6c18 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -153,7 +153,7 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
if (isalarm(ctx))
remaining = alarm_expires_remaining(&ctx->t.alarm);
else
- remaining = hrtimer_expires_remaining(&ctx->t.tmr);
+ remaining = hrtimer_expires_remaining_adjusted(&ctx->t.tmr);
return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
}