summaryrefslogtreecommitdiffstats
path: root/sys/i386/acpica/acpi_wakeup.c
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-11-01 00:18:29 +0000
committernjl <njl@FreeBSD.org>2003-11-01 00:18:29 +0000
commitb98ee2e97a7d4242a800223421cf440ec03f1209 (patch)
treeb81c9fe9b0fde83ec087921f65735bd346394250 /sys/i386/acpica/acpi_wakeup.c
parent9418dac4b7bb4111dee7d77a471f081dc9022a06 (diff)
downloadFreeBSD-src-b98ee2e97a7d4242a800223421cf440ec03f1209.zip
FreeBSD-src-b98ee2e97a7d4242a800223421cf440ec03f1209.tar.gz
Change the reset video option to be positive (hw.acpi.reset_video).
Requested by: jhb Initialize the real mode stack. This is needed at least for the return address from the lcall. Requested by: takawata Fix style bugs in acpi_wakecode.S Requested by: bde Remove the kernel option now that we have the tunable.
Diffstat (limited to 'sys/i386/acpica/acpi_wakeup.c')
-rw-r--r--sys/i386/acpica/acpi_wakeup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index adf366e..5be0c2f 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -61,8 +61,8 @@ __FBSDID("$FreeBSD$");
#define vm_page_unlock_queues()
#endif
-extern u_int32_t acpi_no_reset_video;
-extern void initializecpu(void);
+extern uint32_t acpi_reset_video;
+extern void initializecpu(void);
static struct region_descriptor r_idt, r_gdt, *p_gdt;
static u_int16_t r_ldt;
@@ -233,7 +233,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
WAKECODE_FIXUP(previous_cr3, u_int32_t, r_cr3);
WAKECODE_FIXUP(previous_cr4, u_int32_t, r_cr4);
- WAKECODE_FIXUP(no_reset_video, u_int32_t, acpi_no_reset_video);
+ WAKECODE_FIXUP(reset_video, uint32_t, acpi_reset_video);
WAKECODE_FIXUP(previous_tr, u_int16_t, r_tr);
WAKECODE_BCOPY(previous_gdt, struct region_descriptor, r_gdt);
OpenPOWER on IntegriCloud