diff options
| author | Bart Van Assche <bart.vanassche@gmail.com> | 2013-05-21 20:43:50 +0200 |
|---|---|---|
| committer | Xavier Boudet <xboudet@gmail.com> | 2013-07-22 08:20:41 +0200 |
| commit | 731fdbb8ff4d99dbefc41c5d8b6fd8f41be241e3 (patch) | |
| tree | 9d4c0e68d2c695e9ce3b524d77644ab5f7ddff8a /kernel | |
| parent | 65e3f8ecef2d1ce3d2527b0dcd17e4f5ca33f769 (diff) | |
timer: Fix jiffies wrap behavior of round_jiffies_common()
commit 9e04d3804d3ac97d8c03a41d78d0f0674b5d01e1 upstream.
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
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/timer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index dd93d90f026e..7e0a770be489 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -145,9 +145,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; } /** |