Message ID | 1373552708-15235-65-git-send-email-luis.henriques@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/kernel/timer.c b/kernel/timer.c index 742912b..fab4c3b 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; } /**