diff options
| author | kib <kib@FreeBSD.org> | 2017-06-14 05:12:09 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-06-14 05:12:09 +0000 |
| commit | ba3dbda004b3fc09177c18b830fef17217b89c97 (patch) | |
| tree | e4723ff7ea6519f1c8ccb65327967ffe40dfd5c6 | |
| parent | fa3c3b7f1c4c6d3a848e756ab57d8837965455af (diff) | |
| download | FreeBSD-src-ba3dbda004b3fc09177c18b830fef17217b89c97.zip FreeBSD-src-ba3dbda004b3fc09177c18b830fef17217b89c97.tar.gz | |
MFC r319825:
More accurately handle early EFER restoration on resume.
Approved by: re (delphij)
| -rw-r--r-- | sys/x86/acpica/acpi_wakeup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c index 74f4fed..690f8b7 100644 --- a/sys/x86/acpica/acpi_wakeup.c +++ b/sys/x86/acpica/acpi_wakeup.c @@ -224,7 +224,8 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0)); #ifdef __amd64__ - WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); + WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER) & + ~(EFER_LMA)); #else WAKECODE_FIXUP(wakeup_cr4, register_t, pcb->pcb_cr4); #endif |
