Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40417
b: refs/heads/master
c: bb1d860
h: refs/heads/master
i:
  40415: e52ecc3
v: v3
  • Loading branch information
Jim Houston authored and Linus Torvalds committed Oct 28, 2006
1 parent 2bcfc4a commit 30e893a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eba6cd671427df295c10b54ee69cd5de419d38fe
refs/heads/master: bb1d860551c4307b1a7ee9a21b120319075e987e
2 changes: 1 addition & 1 deletion trunk/kernel/time/ntp.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ void second_overflow(void)
time_adjust += MAX_TICKADJ;
tick_length -= MAX_TICKADJ_SCALED;
} else {
time_adjust = 0;
tick_length += (s64)(time_adjust * NSEC_PER_USEC /
HZ) << TICK_LENGTH_SHIFT;
time_adjust = 0;
}
}
}
Expand Down

0 comments on commit 30e893a

Please sign in to comment.