Module Name: src Committed By: maxv Date: Sun Jul 24 14:09:22 UTC 2016
Modified Files: src/sys/arch/i386/acpi: acpi_wakecode.S acpi_wakeup_low.S src/sys/arch/x86/acpi: acpi_wakeup.c Log Message: The MSR EFER state is not saved and restored when sleeping on i386. On PAE, the CPU crashes right after waking up, since it needs to access NOX-ed pages, which are to be enabled in an MSR. Fix this by properly saving and restoring the EFER MSR. It's a little tricky since the wakeup code uses %edx, but rdmsr overwrites it. We just save it in %esi. Now, the CPU sleeps properly on PAE kernels. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/acpi/acpi_wakecode.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/acpi/acpi_wakeup_low.S cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/acpi/acpi_wakeup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.