svn commit: r319937 - stable/11/sys/x86/acpica

[Konstantin Belousov]

Author: kib
Date: Wed Jun 14 05:12:09 2017
New Revision: 319937
URL: https://svnweb.freebsd.org/changeset/base/319937

Log:
  MFC r319825:
  More accurately handle early EFER restoration on resume.
  
  Approved by:	re (delphij)

Modified:
  stable/11/sys/x86/acpica/acpi_wakeup.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/acpica/acpi_wakeup.c
==============================================================================
--- stable/11/sys/x86/acpica/acpi_wakeup.c	Wed Jun 14 04:26:37 2017	(r319936)
+++ stable/11/sys/x86/acpica/acpi_wakeup.c	Wed Jun 14 05:12:09 2017	(r319937)
@@ -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