summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-08 13:21:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-08 13:21:28 -0800
commit09d9673d53005fdf40de4c759425893904292236 (patch)
tree0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5 /kernel
parentfb38f9b8fe98a9c1f6b1e57d1b08b1102b293929 (diff)
parentc9c024b3f3e07d087974db4c0dc46217fff3a6c0 (diff)
downloadlinux-09d9673d53005fdf40de4c759425893904292236.tar.bz2
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: alarmtimers: Fix time comparison ptp: Fix clock_getres() implementation
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/alarmtimer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index c436e790b21b..8a46f5d64504 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -195,7 +195,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
struct alarm *alarm;
ktime_t expired = next->expires;
- if (expired.tv64 >= now.tv64)
+ if (expired.tv64 > now.tv64)
break;
alarm = container_of(next, struct alarm, node);