diff options
| author | Ingo Molnar <mingo@elte.hu> | 2007-10-17 10:26:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 19:42:47 +0400 |
| commit | a115d5caca1a2905ba7a32b408a6042b20179aaa (patch) | |
| tree | fe79f98f103d0d8776ca7971882e9c21753ae67f | |
| parent | a3b13c23f186ecb57204580cc1f2dbe9c284953a (diff) | |
| download | linux-a115d5caca1a2905ba7a32b408a6042b20179aaa.tar.xz | |
fix the softlockup watchdog to actually work
this Xen related commit:
commit 966812dc98e6a7fcdf759cbfa0efab77500a8868
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue May 8 00:28:02 2007 -0700
Ignore stolen time in the softlockup watchdog
broke the softlockup watchdog to never report any lockups. (!)
print_timestamp defaults to 0, this makes the following condition
always true:
if (print_timestamp < (touch_timestamp + 1) ||
and we'll in essence never report soft lockups.
apparently the functionality of the soft lockup watchdog was never
actually tested with that patch applied ...
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/softlockup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 68f7606b4160..e423b3a918fd 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c @@ -82,10 +82,11 @@ void softlockup_tick(void) print_timestamp = per_cpu(print_timestamp, this_cpu); /* report at most once a second */ - if (print_timestamp < (touch_timestamp + 1) || - did_panic || - !per_cpu(watchdog_task, this_cpu)) + if ((print_timestamp >= touch_timestamp && + print_timestamp < (touch_timestamp + 1)) || + did_panic || !per_cpu(watchdog_task, this_cpu)) { return; + } /* do not print during early bootup: */ if (unlikely(system_state != SYSTEM_RUNNING)) { |