diff --git a/[refs] b/[refs] index 41063a50f38d..746fbf6cd093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d5be7f4e8515af461cbc8f07687ccc81507d508 +refs/heads/master: dd7a1e5615b1719c0fdffee1ea5a7820ac8141a6 diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c index 97977ecc3171..d53ab702a7db 100644 --- a/trunk/kernel/softlockup.c +++ b/trunk/kernel/softlockup.c @@ -130,8 +130,11 @@ void softlockup_tick(void) now = get_timestamp(this_cpu); - /* Wake up the high-prio watchdog task every second: */ - if (now > (touch_timestamp + 1)) + /* + * Wake up the high-prio watchdog task twice per + * threshold timespan. + */ + if (now > touch_timestamp + softlockup_thresh/2) wake_up_process(per_cpu(watchdog_task, this_cpu)); /* Warn about unreasonable delays: */