Author: jkim
Date: Fri Jun 1 18:18:48 2012
New Revision: 236414
URL: http://svn.freebsd.org/changeset/base/236414
Log:
Call AcpiSetFirmwareWakingVector() with interrupt disabled for consistency.
Modified:
head/sys/amd64/acpica/acpi_wakeup.c
head/sys/i386/acpica/acpi_wakeup.c
Modified: head/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/amd64/acpica/acpi_wakeup.c Fri Jun 1 18:16:10 2012
(r236413)
+++ head/sys/amd64/acpica/acpi_wakeup.c Fri Jun 1 18:18:48 2012
(r236414)
@@ -310,10 +310,10 @@ acpi_wakeup_machdep(struct acpi_softc *s
#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);
Modified: head/sys/i386/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/i386/acpica/acpi_wakeup.c Fri Jun 1 18:16:10 2012
(r236413)
+++ head/sys/i386/acpica/acpi_wakeup.c Fri Jun 1 18:18:48 2012
(r236414)
@@ -296,10 +296,10 @@ acpi_wakeup_machdep(struct acpi_softc *s
#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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
