From 54095a6ec7b11a008c07c5016b025206a051f560 Mon Sep 17 00:00:00 2001 From: Giovambattista Pulcini Date: Sat, 16 Apr 2005 15:24:24 -0700 Subject: [PATCH] ppc32: Fix a problem with NTP on !(chrp||gemini) The following problem was found by Giovambattista Pulcini , who also provided a partial patch, and this has been verified by our time guru Gabriel Paubert . 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc/kernel/time.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/ppc/kernel/time.c') diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 50724139402..b3cee6b0145 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); -- cgit v1.2.3