From dba8c0a565199df70a86f6a036d00c92f0c7675f Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 30 Sep 2016 22:40:58 +0000 Subject: MFC: r284583, r285797, r285799, r287168, r298714, r298720, r298838, r300879 Merge ACPICA up to 20160527. Requested by: mav --- sys/x86/acpica/acpi_wakeup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/x86/acpica') diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c index a839f7c..7c5286f 100644 --- a/sys/x86/acpica/acpi_wakeup.c +++ b/sys/x86/acpica/acpi_wakeup.c @@ -202,7 +202,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) if (acpi_resume_beep != 0) timer_spkr_acquire(); - AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); + AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc), 0); intr_suspend(); @@ -287,7 +287,7 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, #endif intr_resume(/*suspend_cancelled*/false); - AcpiSetFirmwareWakingVector(0); + AcpiSetFirmwareWakingVector(0, 0); } else { /* Wakeup MD procedures in interrupt enabled context */ if (sleep_result == 1 && mem_range_softc.mr_op != NULL && -- cgit v1.1