From 5a32678989a43269dbbfc931f971a8bca22f5919 Mon Sep 17 00:00:00 2001 From: Mike Larkin Date: Sun, 22 Nov 2009 22:38:44 +0000 Subject: 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@ --- sys/arch/i386/i386/acpi_wakecode.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sys/arch') 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 -- cgit v1.2.3