diff --git a/[refs] b/[refs] index 746fbf6cd093..262c2db73030 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd7a1e5615b1719c0fdffee1ea5a7820ac8141a6 +refs/heads/master: 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c index d53ab702a7db..7bd8d1aadd5d 100644 --- a/trunk/kernel/softlockup.c +++ b/trunk/kernel/softlockup.c @@ -116,11 +116,8 @@ void softlockup_tick(void) print_timestamp = per_cpu(print_timestamp, this_cpu); /* report at most once a second */ - if ((print_timestamp >= touch_timestamp && - print_timestamp < (touch_timestamp + 1)) || - did_panic) { + if (print_timestamp == touch_timestamp || did_panic) return; - } /* do not print during early bootup: */ if (unlikely(system_state != SYSTEM_RUNNING)) {