diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /arch/h8300/kernel/time.c | |
parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/h8300/kernel/time.c')
-rw-r--r-- | arch/h8300/kernel/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c index 8a600218334d..af8c5d2057dd 100644 --- a/arch/h8300/kernel/time.c +++ b/arch/h8300/kernel/time.c | |||
@@ -116,10 +116,7 @@ int do_settimeofday(struct timespec *tv) | |||
116 | 116 | ||
117 | xtime.tv_sec = tv->tv_sec; | 117 | xtime.tv_sec = tv->tv_sec; |
118 | xtime.tv_nsec = tv->tv_nsec; | 118 | xtime.tv_nsec = tv->tv_nsec; |
119 | time_adjust = 0; /* stop active adjtime() */ | 119 | ntp_clear(); |
120 | time_status |= STA_UNSYNC; | ||
121 | time_maxerror = NTP_PHASE_LIMIT; | ||
122 | time_esterror = NTP_PHASE_LIMIT; | ||
123 | write_sequnlock_irq(&xtime_lock); | 120 | write_sequnlock_irq(&xtime_lock); |
124 | clock_was_set(); | 121 | clock_was_set(); |
125 | return 0; | 122 | return 0; |