diff options
| author | Giovambattista Pulcini <gpulcini@swintel.it> | 2005-04-16 15:24:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:24 -0700 |
| commit | 54095a6ec7b11a008c07c5016b025206a051f560 (patch) | |
| tree | 7e2abe2dc483e05387c331ec41e1f5c51678dd3e /arch | |
| parent | fd16230a05751af5a221a1f1c988bb519fd66679 (diff) | |
| download | op-kernel-dev-54095a6ec7b11a008c07c5016b025206a051f560.zip op-kernel-dev-54095a6ec7b11a008c07c5016b025206a051f560.tar.gz | |
[PATCH] ppc32: Fix a problem with NTP on !(chrp||gemini)
The following problem was found by Giovambattista Pulcini
<gpulcini@swintel.it>, who also provided a partial patch, and this has been
verified by our time guru Gabriel Paubert <paubert@iram.es>.
The problem is that in do_settimeofday() we always set time_state to
TIME_ERROR and except on two platforms, never re-set it. This meant that
ntp_gettime() and ntp_adjtime() always returned TIME_ERROR, incorrectly.
Based on Gabriel's analysis, time_state is used for leap-second processing,
and ppc shouldn't be mucking with it.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/kernel/time.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/chrp_time.c | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/gemini_setup.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 5072413..b3cee6b 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -272,7 +272,6 @@ int do_settimeofday(struct timespec *tv) time_adjust = 0; /* stop active adjtime() */ time_status |= STA_UNSYNC; - time_state = TIME_ERROR; /* p. 24, (a) */ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irqrestore(&xtime_lock, flags); diff --git a/arch/ppc/platforms/chrp_time.c b/arch/ppc/platforms/chrp_time.c index e2be0c8..4864a7d 100644 --- a/arch/ppc/platforms/chrp_time.c +++ b/arch/ppc/platforms/chrp_time.c @@ -115,8 +115,6 @@ int __chrp chrp_set_rtc_time(unsigned long nowtime) chrp_cmos_clock_write(save_control, RTC_CONTROL); chrp_cmos_clock_write(save_freq_select, RTC_FREQ_SELECT); - if ( (time_state == TIME_ERROR) || (time_state == TIME_BAD) ) - time_state = TIME_OK; spin_unlock(&rtc_lock); return 0; } diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c index 1a42cb9..e391e52 100644 --- a/arch/ppc/platforms/gemini_setup.c +++ b/arch/ppc/platforms/gemini_setup.c @@ -433,9 +433,6 @@ gemini_set_rtc_time( unsigned long now ) /* done writing */ gemini_rtc_write(reg, M48T35_RTC_CONTROL); - if ((time_state == TIME_ERROR) || (time_state == TIME_BAD)) - time_state = TIME_OK; - return 0; } |
