Author: kib
Date: Wed Jul 1 01:12:23 2020
New Revision: 362819
URL: https://svnweb.freebsd.org/changeset/base/362819
Log:
MFC r362033:
Remove double-calls to tc_get_timecount() to warm timecounters
Modified:
stable/12/sys/dev/acpica/acpi.c
stable/12/sys/dev/acpica/acpi_timer.c
stable/12/sys/dev/xen/control/control.c
stable/12/sys/kern/kern_tc.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/acpica/acpi.c
==============================================================================
--- stable/12/sys/dev/acpica/acpi.c Wed Jul 1 00:59:28 2020
(r362818)
+++ stable/12/sys/dev/acpica/acpi.c Wed Jul 1 01:12:23 2020
(r362819)
@@ -3195,7 +3195,6 @@ acpi_resync_clock(struct acpi_softc *sc)
* Warm up timecounter again and reset system clock.
*/
(void)timecounter->tc_get_timecount(timecounter);
- (void)timecounter->tc_get_timecount(timecounter);
inittodr(time_second + sc->acpi_sleep_delay);
}
Modified: stable/12/sys/dev/acpica/acpi_timer.c
==============================================================================
--- stable/12/sys/dev/acpica/acpi_timer.c Wed Jul 1 00:59:28 2020
(r362818)
+++ stable/12/sys/dev/acpica/acpi_timer.c Wed Jul 1 01:12:23 2020
(r362819)
@@ -274,7 +274,6 @@ acpi_timer_resume_handler(struct timecounter *newtc)
"restoring timecounter, %s -> %s\n",
tc->tc_name, newtc->tc_name);
(void)newtc->tc_get_timecount(newtc);
- (void)newtc->tc_get_timecount(newtc);
timecounter = newtc;
}
}
Modified: stable/12/sys/dev/xen/control/control.c
==============================================================================
--- stable/12/sys/dev/xen/control/control.c Wed Jul 1 00:59:28 2020
(r362818)
+++ stable/12/sys/dev/xen/control/control.c Wed Jul 1 01:12:23 2020
(r362819)
@@ -303,7 +303,6 @@ xctrl_suspend()
* Warm up timecounter again and reset system clock.
*/
timecounter->tc_get_timecount(timecounter);
- timecounter->tc_get_timecount(timecounter);
inittodr(time_second);
#ifdef EARLY_AP_STARTUP
Modified: stable/12/sys/kern/kern_tc.c
==============================================================================
--- stable/12/sys/kern/kern_tc.c Wed Jul 1 00:59:28 2020
(r362818)
+++ stable/12/sys/kern/kern_tc.c Wed Jul 1 01:12:23 2020
(r362819)
@@ -1201,7 +1201,6 @@ tc_init(struct timecounter *tc)
tc->tc_frequency < timecounter->tc_frequency)
return;
(void)tc->tc_get_timecount(tc);
- (void)tc->tc_get_timecount(tc);
timecounter = tc;
}
@@ -1464,7 +1463,6 @@ sysctl_kern_timecounter_hardware(SYSCTL_HANDLER_ARGS)
/* Warm up new timecounter. */
(void)newtc->tc_get_timecount(newtc);
- (void)newtc->tc_get_timecount(newtc);
timecounter = newtc;
@@ -1955,7 +1953,6 @@ inittimecounter(void *dummy)
#endif
/* warm up new timecounter (again) and get rolling. */
- (void)timecounter->tc_get_timecount(timecounter);
(void)timecounter->tc_get_timecount(timecounter);
mtx_lock_spin(&tc_setclock_mtx);
tc_windup(NULL);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
