Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

timer: Fix jiffies wrap behavior of round_jiffies_common()

Browse Source 
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>
This commit is contained in:
Bart Van Assche 2013-05-21 20:43:50 +02:00 committed by Greg Kroah-Hartman
parent 95a5e32993
commit a3d56dfedb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/timer.c
View File

@ -148,9 +148,11 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu,
/* now that we have rounded, subtract the extra skew again */ /* now that we have rounded, subtract the extra skew again */
j -= cpu * 3; j -= cpu * 3;
if (j <= jiffies) /* rounding ate our timeout entirely; */ /*
return original; * Make sure j is still in the future. Otherwise return the
return j; * unmodified value.
*/
return time_is_after_jiffies(j) ? j : original;
} }
/** /**