Commit 122c215b authored Apr 12, 2019 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
 "Fix the alarm_timer_remaining() return value"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimer: Return correct remaining time

parents 5e6f1fee 07d7e120

kernel/time/alarmtimer.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -594,7 +594,7 @@ static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now)
	{		{
	struct alarm *alarm = &timr->it.alarm.alarmtimer;		struct alarm *alarm = &timr->it.alarm.alarmtimer;

	return ktime_sub(now, alarm->node.expires);		return ktime_sub(alarm->node.expires, now);
	}		}

	/**		/**

Admin message