diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-09-30 23:28:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 00:39:26 -0700 |
| commit | 8f807f8d2137ba728d22820103131038639b68a9 (patch) | |
| tree | cea8d4eedbffc17ea9a01808afacb0e02dbbe206 /kernel/timer.c | |
| parent | 3d3675cc3d04d7fd4bb11e8c1ea79e5ade4f5e44 (diff) | |
| download | linux-8f807f8d2137ba728d22820103131038639b68a9.tar.gz linux-8f807f8d2137ba728d22820103131038639b68a9.tar.bz2 linux-8f807f8d2137ba728d22820103131038639b68a9.zip | |
[PATCH] ntp: add time_adjust to tick length
This folds update_ntp_one_tick() into second_overflow() and adds time_adjust
to the tick length, this makes time_next_adjust unnecessary. This slightly
changes the adjtime() behaviour, instead of applying it to the next tick, it's
applied to the next second.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 78d3fa10fcd6..654dd5df2417 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -937,8 +937,6 @@ static void update_wall_time(void) /* interpolator bits */ time_interpolator_update(clock->xtime_interval >> clock->shift); - /* increment the NTP state machine */ - update_ntp_one_tick(); /* accumulate error between NTP and clock interval */ clock->error += current_tick_length(); |