---

yaml --- r: 38 b: refs/heads/master c: 54095a6 h: refs/heads/master v: v3
git-mirror · Apr 16, 2005 · 1b4b2ba · 1b4b2ba
1 parent d64a9de
commit 1b4b2ba
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd16230a05751af5a221a1f1c988bb519fd66679
+refs/heads/master: 54095a6ec7b11a008c07c5016b025206a051f560
diff --git a/trunk/arch/ppc/kernel/time.c b/trunk/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/trunk/arch/ppc/platforms/chrp_time.c b/trunk/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/trunk/arch/ppc/platforms/gemini_setup.c b/trunk/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;
 }