| From 07d7e12091f4ab869cc6a4bb276399057e73b0b3 Mon Sep 17 00:00:00 2001 |
| From: Andrei Vagin <avagin@gmail.com> |
| Date: Sun, 7 Apr 2019 21:15:42 -0700 |
| Subject: alarmtimer: Return correct remaining time |
| |
| From: Andrei Vagin <avagin@gmail.com> |
| |
| commit 07d7e12091f4ab869cc6a4bb276399057e73b0b3 upstream. |
| |
| To calculate a remaining time, it's required to subtract the current time |
| from the expiration time. In alarm_timer_remaining() the arguments of |
| ktime_sub are swapped. |
| |
| Fixes: d653d8457c76 ("alarmtimer: Implement remaining callback") |
| Signed-off-by: Andrei Vagin <avagin@gmail.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> |
| Cc: Stephen Boyd <sboyd@kernel.org> |
| Cc: John Stultz <john.stultz@linaro.org> |
| Cc: stable@vger.kernel.org |
| Link: https://lkml.kernel.org/r/20190408041542.26338-1-avagin@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/time/alarmtimer.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/time/alarmtimer.c |
| +++ b/kernel/time/alarmtimer.c |
| @@ -594,7 +594,7 @@ static ktime_t alarm_timer_remaining(str |
| { |
| struct alarm *alarm = &timr->it.alarm.alarmtimer; |
| |
| - return ktime_sub(now, alarm->node.expires); |
| + return ktime_sub(alarm->node.expires, now); |
| } |
| |
| /** |