diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 21:20:23 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-12-06 11:38:32 +0100 |
| commit | c9c024b3f3e07d087974db4c0dc46217fff3a6c0 (patch) | |
| tree | 4dd125eef6c2f332d641876fac0e6f522b1d75c5 /kernel/time | |
| parent | ptp: Fix clock_getres() implementation (diff) | |
| download | linux-c9c024b3f3e07d087974db4c0dc46217fff3a6c0.tar.xz linux-c9c024b3f3e07d087974db4c0dc46217fff3a6c0.zip | |
alarmtimers: Fix time comparison
The expiry function compares the timer against current time and does
not expire the timer when the expiry time is >= now. That's wrong. If
the timer is set for now, then it must expire.
Make the condition expiry > now for breaking out the loop.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: stable@kernel.org
Diffstat (limited to 'kernel/time')
| -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) 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); |