diff options
| author | Bart Van Assche <bart.vanassche@gmail.com> | 2013-05-21 20:43:50 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-06-28 17:10:11 +0200 |
| commit | 9e04d3804d3ac97d8c03a41d78d0f0674b5d01e1 (patch) | |
| tree | e87aa9422e11e5f28020535b9f1ba095058682a7 /kernel/timer.c | |
| parent | clocksource: vf_pit_timer: Use linux/sched_clock.h (diff) | |
| download | linux-9e04d3804d3ac97d8c03a41d78d0f0674b5d01e1.tar.xz linux-9e04d3804d3ac97d8c03a41d78d0f0674b5d01e1.zip | |
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>
Diffstat (limited to 'kernel/timer.c')
| -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 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; } /** |