diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 15:53:14 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 15:53:14 -0700 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /kernel/time.c | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
| download | kernel-crypto-325a479c4c110db278ef3361460a48c4093252cc.tar.gz kernel-crypto-325a479c4c110db278ef3361460a48c4093252cc.tar.xz kernel-crypto-325a479c4c110db278ef3361460a48c4093252cc.zip | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/time.c b/kernel/time.c index 96fd0f49963..d4335c1c884 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -516,14 +516,6 @@ int do_settimeofday (struct timespec *tv) write_seqlock_irq(&xtime_lock); { - /* - * This is revolting. We need to set "xtime" correctly. However, the value - * in this location is the value at the most recent update of wall time. - * Discover what correction gettimeofday would have done, and then undo - * it! - */ - nsec -= time_interpolator_get_offset(); - wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); |