[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-8c2eb4805d422bdbf60ba00ff233c794d23c3c00@git.kernel.org>
Date: Mon, 22 Mar 2010 07:45:51 GMT
From: tip-bot for Colin Ian King <colin.king@...onical.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
eric.dumazet@...il.com, a.p.zijlstra@...llo.nl, stable@...nel.org,
colin.king@...onical.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:core/urgent] softlockup: Stop spurious softlockup messages due to overflow
Commit-ID: 8c2eb4805d422bdbf60ba00ff233c794d23c3c00
Gitweb: http://git.kernel.org/tip/8c2eb4805d422bdbf60ba00ff233c794d23c3c00
Author: Colin Ian King <colin.king@...onical.com>
AuthorDate: Fri, 19 Mar 2010 10:28:02 +0000
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 21 Mar 2010 19:30:13 +0100
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@...onical.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Eric Dumazet <eric.dumazet@...il.com>
Cc: <stable@...nel.org>
LKML-Reference: <1268994482.1798.6.camel@...ovo>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/softlockup.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 0d4c789..4b493f6 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists