diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2009-11-22 22:38:44 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2009-11-22 22:38:44 +0000 |
| commit | 5a32678989a43269dbbfc931f971a8bca22f5919 (patch) | |
| tree | ae61e0a3d64842f9b1d80f7ba7cd1c804a8336b4 /sys/arch | |
| parent | 45185d600bccff75c24b3fde89e16836acacd32d (diff) | |
Repost the vbios and remove a spurious cli on i386 ACPI resume code.
Makes i386 and amd64 behave the same way with respect to vbios repost.
ok pirofti@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/acpi_wakecode.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/acpi_wakecode.S b/sys/arch/i386/i386/acpi_wakecode.S index 7dfdc892654..2b0ff810e92 100644 --- a/sys/arch/i386/i386/acpi_wakecode.S +++ b/sys/arch/i386/i386/acpi_wakecode.S @@ -124,7 +124,7 @@ _C_LABEL(acpi_real_mode_resume): * laptops), we might not restore the proper VGA mode * on resume. Caveat emptor. */ - jmp nobiosreset /* XXX make this a tunable */ + /* jmp nobiosreset */ /* XXX make this a tunable */ lcall $0xc000,$3 /* @@ -304,7 +304,6 @@ _C_LABEL(acpi_protected_mode_resume): movl acpi_saved_esp, %esp push acpi_saved_fl popfl - cli /* * Return to the OS. We've previously saved the resume |