upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset switchtime to zero rather than the current CPU ticker (TSC) value.

Browse source 
It is more appropriate in this context because TSC MSR is reset to zero
when the CPU is restarted from S3 and above.  Move acpi_resync_clock() back
to where it was before r211202.  It does not make a difference any more.
This commit is contained in:
Jung-uk Kim 2010-08-13 22:08:42 +00:00
parent 4a2637c486
commit 0405a5efe7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/amd64/acpica/acpi_wakeup.c
View file

@ -278,13 +278,13 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
for (;;)
ia32_pause();
} else {
acpi_resync_clock(sc);
PCPU_SET(switchtime, cpu_ticks());
PCPU_SET(switchtime, 0);
PCPU_SET(switchticks, ticks);
#ifdef SMP
if (wakeup_cpus != 0)
acpi_wakeup_cpus(sc, wakeup_cpus);
#endif
acpi_resync_clock(sc);
ret = 0;
}

2
sys/amd64/amd64/mp_machdep.c
View file

@ -1366,7 +1366,7 @@ cpususpend_handler(void)
wbinvd();
atomic_set_int(&stopped_cpus, cpumask);
} else {
PCPU_SET(switchtime, cpu_ticks());
PCPU_SET(switchtime, 0);
PCPU_SET(switchticks, ticks);
}