| Message ID | 1412838271-11175-2-git-send-email-pang.xunlei@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Thu, Oct 9, 2014 at 12:04 AM, pang.xunlei <pang.xunlei@linaro.org> wrote: > The clocksource mult-adjustment threshold is [mult-maxadj, mult+maxadj], > timekeeping_adjust() only deals with the upper threshold, but misses the > lower threshold. > > This patch adds the lower threshold judging condition. > > Signed-off-by: pang.xunlei <pang.xunlei@linaro.org> Added to my 3.19 queue. thanks! -john -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index cad61b3..469cdbf 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1403,7 +1403,7 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset) } if (unlikely(tk->tkr.clock->maxadj && - (tk->tkr.mult > tk->tkr.clock->mult + tk->tkr.clock->maxadj))) { + (abs(tk->tkr.mult - tk->tkr.clock->mult) > tk->tkr.clock->maxadj))) { printk_once(KERN_WARNING "Adjusting %s more than 11%% (%ld vs %ld)\n", tk->tkr.clock->name, (long)tk->tkr.mult,
The clocksource mult-adjustment threshold is [mult-maxadj, mult+maxadj], timekeeping_adjust() only deals with the upper threshold, but misses the lower threshold. This patch adds the lower threshold judging condition. Signed-off-by: pang.xunlei <pang.xunlei@linaro.org> --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)