Prev: [097/116] ALSA: hda: Use LPIB for ga-ma770-ud3 board
Next: [054/116] tmpfs: handle MPOL_LOCAL mount option properly
From: Greg KH on 30 Mar 2010 20:10
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: Colin Ian King <colin.king(a)canonical.com>

commit 8c2eb4805d422bdbf60ba00ff233c794d23c3c00 upstream.

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(a)canonical.com>
Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
Cc: Eric Dumazet <eric.dumazet(a)gmail.com>
LKML-Reference: <1268994482.1798.6.camel(a)lenovo>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
kernel/softlockup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -140,11 +140,11 @@ void softlockup_tick(void)
* Wake up the high-prio watchdog task twice per
* threshold timespan.
*/
- if (now > touch_timestamp + softlockup_thresh/2)
+ if (time_after(now - softlockup_thresh/2, touch_timestamp))
wake_up_process(per_cpu(watchdog_task, this_cpu));

/* Warn about unreasonable delays: */
- if (now <= (touch_timestamp + softlockup_thresh))
+ if (time_before_eq(now - softlockup_thresh, touch_timestamp))
return;

per_cpu(print_timestamp, this_cpu) = touch_timestamp;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [097/116] ALSA: hda: Use LPIB for ga-ma770-ud3 board
Next: [054/116] tmpfs: handle MPOL_LOCAL mount option properly