Date: Fri, 1 Jun 2012 18:18:48 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r236414 - in head/sys: amd64/acpica i386/acpica Message-ID: <201206011818.q51IImh5035315@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206011818.q51IImh5035315>