From: Bart Van Assche <bart.vanassche@gmail.com>
Date: Thu, 27 Jun 2013 23:50:59 +0000 (+1000)
Subject: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*()
X-Git-Tag: next-20130628~3^2~655
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17973ad3740afad437bfbeea00184363f7c831f3;p=karo-tx-linux.git

kernel/timer.c: fix jiffies wrap behavior of round_jiffies*()

Make sure that the round_jiffies*() functions return a time that is
in the future when the jiffies counter has recently wrapped.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/kernel/timer.c b/kernel/timer.c
index 15ffdb3f1948..aa8b9642118b 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -149,9 +149,7 @@ 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;
+	return time_is_after_jiffies(j) ? j : original;
 }
 
 /**