svn commit: r327774 - in head: . sys/i386/bios

[Warner Losh]

Author: imp
Date: Wed Jan 10 17:25:08 2018
New Revision: 327774
URL: https://svnweb.freebsd.org/changeset/base/327774

Log:
  inittodr(0) actually sets the time, so there's no need to call
  tc_setclock(). It's redundant. Tweak UPDATING based on code review of
  past releases.
  
  Relnotes: yes (for the removal of pmtimer)

Modified:
  head/UPDATING
  head/sys/i386/bios/apm.c

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Jan 10 16:56:02 2018	(r327773)
+++ head/UPDATING	Wed Jan 10 17:25:08 2018	(r327774)
@@ -53,8 +53,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 20180110:
 	On i386, pmtimer has been removed. It's functionality has been folded
-	into apm. It was a nop on ACPI. Users may need to remove it from kernel
-	config files.
+	into apm. It was a nop on ACPI in current for a while now (but was still
+	needed on i386 in FreeBSD 11 and earlier). Users may need to remove it
+	from kernel config files.
 
 20180104:
 	The use of RSS hash from the network card aka flowid has been

Modified: head/sys/i386/bios/apm.c
==============================================================================
--- head/sys/i386/bios/apm.c	Wed Jan 10 16:56:02 2018	(r327773)
+++ head/sys/i386/bios/apm.c	Wed Jan 10 17:25:08 2018	(r327774)
@@ -1086,7 +1086,6 @@ apm_rtc_resume(void *arg __unused)
 {
 	u_int second, minute, hour;
 	struct timeval resume_time, tmp_time;
-	struct timespec ts;
 
 	/* modified for adjkerntz */
 	timer_restore();		/* restore the all timers */
@@ -1097,14 +1096,11 @@ apm_rtc_resume(void *arg __unused)
 	/* Calculate the delta time suspended */
 	timevalsub(&resume_time, &suspend_time);
 
-	second = ts.tv_sec = resume_time.tv_sec;
-	ts.tv_nsec = 0;
-	tc_setclock(&ts);
-
 #ifdef PMTIMER_FIXUP_CALLTODO
 	/* Fixup the calltodo list with the delta time. */
 	adjust_timeout_calltodo(&resume_time);
 #endif /* PMTIMER_FIXUP_CALLTODO */
+	second = resume_time.tv_sec;
 	hour = second / 3600;
 	second %= 3600;
 	minute = second / 60;