aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/softlockup.c7
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)
82 print_timestamp = per_cpu(print_timestamp, this_cpu); 82 print_timestamp = per_cpu(print_timestamp, this_cpu);
83 83
84 /* report at most once a second */ 84 /* report at most once a second */
85 if (print_timestamp < (touch_timestamp + 1) || 85 if ((print_timestamp >= touch_timestamp &&
86 did_panic || 86 print_timestamp < (touch_timestamp + 1)) ||
87 !per_cpu(watchdog_task, this_cpu)) 87 did_panic || !per_cpu(watchdog_task, this_cpu)) {
88 return; 88 return;
89 }
89 90
90 /* do not print during early bootup: */ 91 /* do not print during early bootup: */
91 if (unlikely(system_state != SYSTEM_RUNNING)) { 92 if (unlikely(system_state != SYSTEM_RUNNING)) {