Module Name: src Committed By: jmcneill Date: Mon Jun 17 16:34:02 UTC 2019
Modified Files: src/sys/arch/x86/acpi: acpi_wakeup.c Log Message: The second parameter to AcpiSetFirmwareWakingVector sets the X_Firmware_Waking_Vector field (where supported), which will cause firmware to resume in protected mode. Since our wake code assumes real mode, always set X_Firmware_Waking_Vector to 0. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 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.
Modified files: Index: src/sys/arch/x86/acpi/acpi_wakeup.c diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.49 src/sys/arch/x86/acpi/acpi_wakeup.c:1.50 --- src/sys/arch/x86/acpi/acpi_wakeup.c:1.49 Sat Sep 23 10:38:59 2017 +++ src/sys/arch/x86/acpi/acpi_wakeup.c Mon Jun 17 16:34:02 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_wakeup.c,v 1.49 2017/09/23 10:38:59 maxv Exp $ */ +/* $NetBSD: acpi_wakeup.c,v 1.50 2019/06/17 16:34:02 jmcneill Exp $ */ /*- * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.49 2017/09/23 10:38:59 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.50 2019/06/17 16:34:02 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -310,7 +310,7 @@ acpi_md_sleep(int state) return -1; } - AcpiSetFirmwareWakingVector(acpi_wakeup_paddr, acpi_wakeup_paddr); + AcpiSetFirmwareWakingVector(acpi_wakeup_paddr, 0); s = splhigh(); fpusave_cpu(true);