diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-02-22 19:44:12 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-02-22 19:44:12 +0000 |
| commit | e5679bb325436ab27ac755aaf9c1645395b6973f (patch) | |
| tree | 3de75683457189d1ba3b2d9042da354186ed4186 | |
| parent | f382201442ffc18a1f810e8a138a3dc62e2606df (diff) | |
Don't attempt to repost the video hardware. There are quite a few machines
where jumping to the "standard" video BIOS entry point locks up or even
resets the machine. This will break resume on some other machines in the
sense that the display on them will remain disabled. But hopefully those
machines make it into a state where the kernel is running and we can fix that.
ok deraadt@, marco@, mlarkin@
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_wakecode.S | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_wakecode.S | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/acpi_wakecode.S b/sys/arch/amd64/amd64/acpi_wakecode.S index 8beb64f0b6f..89320a11345 100644 --- a/sys/arch/amd64/amd64/acpi_wakecode.S +++ b/sys/arch/amd64/amd64/acpi_wakecode.S @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_wakecode.S,v 1.9 2009/12/09 16:20:33 pirofti Exp $ */ +/* $OpenBSD: acpi_wakecode.S,v 1.10 2010/02/22 19:44:11 kettenis Exp $ */ /* * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org> * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.freebsd.org> @@ -131,7 +131,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 /* diff --git a/sys/arch/i386/i386/acpi_wakecode.S b/sys/arch/i386/i386/acpi_wakecode.S index 121fbe47f4e..78d79124fec 100644 --- a/sys/arch/i386/i386/acpi_wakecode.S +++ b/sys/arch/i386/i386/acpi_wakecode.S @@ -127,7 +127,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 /* |