Commit 9e04d380 authored May 21, 2013 by Bart Van Assche Committed by Thomas Gleixner Jun 28, 2013

timer: Fix jiffies wrap behavior of round_jiffies_common()

Direct compare of jiffies related values does not work in the wrap
around case. Replace it with time_is_after_jiffies().

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/519BC066.5080600@acm.org

Cc: stable@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 26993393

kernel/timer.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/**