X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Ftimerfd.c;h=053818dd6c18be8f228e1c40483e50d78aa78007;hb=431cd3e2917dd98c8c29b8e87aa489f6ddb64917;hp=b94fa6c3c6ebe8c7308aea0052f3afacad9745c4;hpb=4bb9374e0bd40d8fe97860ea0d61a0330b7c3925;p=firefly-linux-kernel-4.4.55.git 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; }