Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a115d5caca1a2905ba7a32b408a6042b20179aaa
Commit:     a115d5caca1a2905ba7a32b408a6042b20179aaa
Parent:     a3b13c23f186ecb57204580cc1f2dbe9c284953a
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:26:06 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:47 2007 -0700

    fix the softlockup watchdog to actually work
    
    this Xen related commit:
    
       commit 966812dc98e6a7fcdf759cbfa0efab77500a8868
       Author: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
       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 <[EMAIL PROTECTED]>
    Cc: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
    Cc: <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 kernel/softlockup.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 68f7606..e423b3a 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)) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to