diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-08 16:21:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-08 16:21:28 -0500 |
| commit | 09d9673d53005fdf40de4c759425893904292236 (patch) | |
| tree | 0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5 /kernel | |
| parent | fb38f9b8fe98a9c1f6b1e57d1b08b1102b293929 (diff) | |
| parent | c9c024b3f3e07d087974db4c0dc46217fff3a6c0 (diff) | |
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.c | 2 |
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) | |||
| 195 | struct alarm *alarm; | 195 | struct alarm *alarm; |
| 196 | ktime_t expired = next->expires; | 196 | ktime_t expired = next->expires; |
| 197 | 197 | ||
| 198 | if (expired.tv64 >= now.tv64) | 198 | if (expired.tv64 > now.tv64) |
| 199 | break; | 199 | break; |
| 200 | 200 | ||
| 201 | alarm = container_of(next, struct alarm, node); | 201 | alarm = container_of(next, struct alarm, node); |