releases/4.19.35/alarmtimer-return-correct-remaining-time.patch

   1 From 07d7e12091f4ab869cc6a4bb276399057e73b0b3 Mon Sep 17 00:00:00 2001
   2 From: Andrei Vagin <avagin@gmail.com>
   3 Date: Sun, 7 Apr 2019 21:15:42 -0700
   4 Subject: alarmtimer: Return correct remaining time
   5
   6 From: Andrei Vagin <avagin@gmail.com>
   7
   8 commit 07d7e12091f4ab869cc6a4bb276399057e73b0b3 upstream.
   9
  10 To calculate a remaining time, it's required to subtract the current time
  11 from the expiration time. In alarm_timer_remaining() the arguments of
  12 ktime_sub are swapped.
  13
  14 Fixes: d653d8457c76 ("alarmtimer: Implement remaining callback")
  15 Signed-off-by: Andrei Vagin <avagin@gmail.com>
  16 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  17 Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
  18 Cc: Stephen Boyd <sboyd@kernel.org>
  19 Cc: John Stultz <john.stultz@linaro.org>
  20 Cc: stable@vger.kernel.org
  21 Link: https://lkml.kernel.org/r/20190408041542.26338-1-avagin@gmail.com
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23
  24 ---
  25  kernel/time/alarmtimer.c |    2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 --- a/kernel/time/alarmtimer.c
  29 +++ b/kernel/time/alarmtimer.c
  30 @@ -597,7 +597,7 @@ static ktime_t alarm_timer_remaining(str
  31  {
  32         struct alarm *alarm = &timr->it.alarm.alarmtimer;
  33
  34 -       return ktime_sub(now, alarm->node.expires);
  35 +       return ktime_sub(alarm->node.expires, now);
  36  }
  37
  38  /**