X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Ftimer.c;h=15bc1b41021dae203b7d3c43293b5edd54cff4cb;hb=aec2327ed02458b481caa2b3943401a7a33ff18f;hp=15ffdb3f1948b9468c2c04527beb8190b0d79d45;hpb=822b4b6fe38bbe23f6bc036288ecd934eef30be5;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/timer.c b/kernel/timer.c
index 15ffdb3f1948..15bc1b41021d 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -149,9 +149,11 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu,
 	/* now that we have rounded, subtract the extra skew again */
 	j -= cpu * 3;
 
-	if (j <= jiffies) /* rounding ate our timeout entirely; */
-		return original;
-	return j;
+	/*
+	 * Make sure j is still in the future. Otherwise return the
+	 * unmodified value.
+	 */
+	return time_is_after_jiffies(j) ? j : original;
 }
 
 /**