diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 20:52:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 20:52:28 -0700 |
| commit | 122c215bfae884f10a189e6754d9603a06b981c3 (patch) | |
| tree | 5402cb8e5c3acb668b8810cf5c8d669a119327b4 /kernel | |
| parent | 5e6f1fee60a3d80582146835ac01d9808748434f (diff) | |
| parent | 07d7e12091f4ab869cc6a4bb276399057e73b0b3 (diff) | |
| download | lwn-122c215bfae884f10a189e6754d9603a06b981c3.tar.gz lwn-122c215bfae884f10a189e6754d9603a06b981c3.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/alarmtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 2c97e8c2d29f..0519a8805aab 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -594,7 +594,7 @@ static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now) { struct alarm *alarm = &timr->it.alarm.alarmtimer; - return ktime_sub(now, alarm->node.expires); + return ktime_sub(alarm->node.expires, now); } /** |