diff --git a/[refs] b/[refs]
index cfaefaa07e24..6c41c8cbcaa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cff810f54b3b52075c27f7a7021d5b195264b6c
+refs/heads/master: 8c2eb4805d422bdbf60ba00ff233c794d23c3c00
diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c
index 0d4c7898ab80..4b493f67dcb5 100644
--- a/trunk/kernel/softlockup.c
+++ b/trunk/kernel/softlockup.c
@@ -155,11 +155,11 @@ void softlockup_tick(void)
 	 * Wake up the high-prio watchdog task twice per
 	 * threshold timespan.
 	 */
-	if (now > touch_ts + softlockup_thresh/2)
+	if (time_after(now - softlockup_thresh/2, touch_ts))
 		wake_up_process(per_cpu(softlockup_watchdog, this_cpu));
 
 	/* Warn about unreasonable delays: */
-	if (now <= (touch_ts + softlockup_thresh))
+	if (time_before_eq(now - softlockup_thresh, touch_ts))
 		return;
 
 	per_cpu(softlockup_print_ts, this_cpu) = touch_ts;