diff options
| author | Colin Ian King <colin.king@canonical.com> | 2010-03-19 10:28:02 +0000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-21 19:30:13 +0100 |
| commit | 8c2eb4805d422bdbf60ba00ff233c794d23c3c00 (patch) | |
| tree | add5be0a86cb9453d7d8c6d08847013137a98806 /kernel/softlockup.c | |
| parent | 0cff810f54b3b52075c27f7a7021d5b195264b6c (diff) | |
| download | linux-8c2eb4805d422bdbf60ba00ff233c794d23c3c00.tar.bz2 | |
softlockup: Stop spurious softlockup messages due to overflow
Ensure additions on touch_ts do not overflow. This can occur
when the top 32 bits of the TSC reach 0xffffffff causing
additions to touch_ts to overflow and this in turn generates
spurious softlockup warnings.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: <stable@kernel.org>
LKML-Reference: <1268994482.1798.6.camel@lenovo>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/softlockup.c')
| -rw-r--r-- | kernel/softlockup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 0d4c7898ab80..4b493f67dcb5 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c @@ -155,11 +155,11 @@ void softlockup_tick(void) * Wake up the high-prio watchdog task twice per * threshold timespan. */ - if (now > touch_ts + softlockup_thresh/2) + if (time_after(now - softlockup_thresh/2, touch_ts)) wake_up_process(per_cpu(softlockup_watchdog, this_cpu)); /* Warn about unreasonable delays: */ - if (now <= (touch_ts + softlockup_thresh)) + if (time_before_eq(now - softlockup_thresh, touch_ts)) return; per_cpu(softlockup_print_ts, this_cpu) = touch_ts; |