Commit-ID: 9e04d3804d3ac97d8c03a41d78d0f0674b5d01e1 Gitweb: http://git.kernel.org/tip/9e04d3804d3ac97d8c03a41d78d0f0674b5d01e1 Author: Bart Van Assche <bart.vanass...@gmail.com> AuthorDate: Tue, 21 May 2013 20:43:50 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Fri, 28 Jun 2013 17:10:11 +0200
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 <bvanass...@acm.org> Cc: Arjan van de Ven <ar...@infradead.org> Cc: Stephen Rothwell <s...@canb.auug.org.au> Link: http://lkml.kernel.org/r/519bc066.5080...@acm.org Cc: sta...@vger.kernel.org Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- kernel/timer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index 15ffdb3..15bc1b4 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; } /** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
