projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
time: Fix sign bug in NTP mult overflow warning
[cascardo/linux.git]
/
kernel
/
time
/
timekeeping.c
diff --git
a/kernel/time/timekeeping.c
b/kernel/time/timekeeping.c
index
29a7d67
..
2dc0646
100644
(file)
--- a/
kernel/time/timekeeping.c
+++ b/
kernel/time/timekeeping.c
@@
-1330,7
+1330,7
@@
static __always_inline void timekeeping_apply_adjustment(struct timekeeper *tk,
*
* XXX - TODO: Doc ntp_error calculation.
*/
- if (
tk->tkr.mult + mult_adj < mult_adj
) {
+ if (
(mult_adj > 0) && (tk->tkr.mult + mult_adj < mult_adj)
) {
/* NTP adjustment caused clocksource mult overflow */
WARN_ON_ONCE(1);
return;