diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-06-01 18:18:48 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-06-01 18:18:48 +0000 |
| commit | 108705d043f734b681ddd450d2afd2050bea3bc8 (patch) | |
| tree | 2558aff556e89b90b6f3d673cd6ac9fe3e1aa678 | |
| parent | ffc06c80d8bb8c15f96ba412c2624d5132836377 (diff) | |
| download | src-108705d043f734b681ddd450d2afd2050bea3bc8.tar.gz src-108705d043f734b681ddd450d2afd2050bea3bc8.zip | |
Call AcpiSetFirmwareWakingVector() with interrupt disabled for consistency.
Notes
Notes:
svn path=/head/; revision=236414
| -rw-r--r-- | sys/amd64/acpica/acpi_wakeup.c | 4 | ||||
| -rw-r--r-- | sys/i386/acpica/acpi_wakeup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 2cd8bc74e058..3e869250cc6b 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -310,10 +310,10 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, #endif mca_resume(); intr_resume(); + + AcpiSetFirmwareWakingVector(0); } else { /* Wakeup MD procedures in interrupt enabled context */ - AcpiSetFirmwareWakingVector(0); - if (sleep_result == 1 && mem_range_softc.mr_op != NULL && mem_range_softc.mr_op->reinit != NULL) mem_range_softc.mr_op->reinit(&mem_range_softc); diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 2c07003b59ac..488226f35cb0 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -296,10 +296,10 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, #endif mca_resume(); intr_resume(); + + AcpiSetFirmwareWakingVector(0); } else { /* Wakeup MD procedures in interrupt enabled context */ - AcpiSetFirmwareWakingVector(0); - if (sleep_result == 1 && mem_range_softc.mr_op != NULL && mem_range_softc.mr_op->reinit != NULL) mem_range_softc.mr_op->reinit(&mem_range_softc); |