diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-18 23:14:45 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-18 23:14:45 +0000 |
| commit | 834a59ac96a56d139d5e26711cae9d9c099ab73e (patch) | |
| tree | 0bdb0afb33a9872049c8a79ec239e8f1c918f4da /sys/x86 | |
| parent | 19250d4f16f66aaad903ed821f23db1b699eeb83 (diff) | |
| parent | 77a98b4be9952afe90f7d9a02f6c901498f31413 (diff) | |
| download | FreeBSD-src-834a59ac96a56d139d5e26711cae9d9c099ab73e.zip FreeBSD-src-834a59ac96a56d139d5e26711cae9d9c099ab73e.tar.gz | |
Merge ACPICA 20150619.
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/acpica/acpi_wakeup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c index 0eb6823..bc1c55c 100644 --- a/sys/x86/acpica/acpi_wakeup.c +++ b/sys/x86/acpica/acpi_wakeup.c @@ -210,7 +210,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(); @@ -298,7 +298,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 && |
