diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-20 11:26:47 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-20 11:26:47 -0700 |
| commit | c36c282b88963d0957368a443168588e62301fda (patch) | |
| tree | 6343887ae42a65635a61b4ad99fd7f3e8dd24758 /kernel/time | |
| parent | f4fbfb0dda5577075a049eec7fb7ad38abca1912 (diff) | |
| parent | 1f564ad6d4182859612cbae452122e5eb2d62a76 (diff) | |
| download | linux-c36c282b88963d0957368a443168588e62301fda.tar.gz linux-c36c282b88963d0957368a443168588e62301fda.tar.bz2 linux-c36c282b88963d0957368a443168588e62301fda.zip | |
Pull ia64-clocksource into release branch
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/ntp.c | 10 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 438c6b723ee2..b5e352597cbb 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -116,11 +116,6 @@ void second_overflow(void) if (xtime.tv_sec % 86400 == 0) { xtime.tv_sec--; wall_to_monotonic.tv_sec++; - /* - * The timer interpolator will make time change - * gradually instead of an immediate jump by one second - */ - time_interpolator_update(-NSEC_PER_SEC); time_state = TIME_OOP; printk(KERN_NOTICE "Clock: inserting leap second " "23:59:60 UTC\n"); @@ -130,11 +125,6 @@ void second_overflow(void) if ((xtime.tv_sec + 1) % 86400 == 0) { xtime.tv_sec++; wall_to_monotonic.tv_sec--; - /* - * Use of time interpolator for a gradual change of - * time - */ - time_interpolator_update(NSEC_PER_SEC); time_state = TIME_WAIT; printk(KERN_NOTICE "Clock: deleting leap second " "23:59:59 UTC\n"); diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 89698776613e..88c81026e003 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -466,10 +466,6 @@ void update_wall_time(void) second_overflow(); } - /* interpolator bits */ - time_interpolator_update(clock->xtime_interval - >> clock->shift); - /* accumulate error between NTP and clock interval */ clock->error += current_tick_length(); clock->error -= clock->xtime_interval << (TICK_LENGTH_SHIFT - clock->shift); |