diff options
| author | jkim <jkim@FreeBSD.org> | 2012-03-19 21:47:50 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-03-19 21:47:50 +0000 |
| commit | 6b5199d29b5bc79c9c8348869b6a06b20c7b5cdb (patch) | |
| tree | 4cfcc94092bfdc7439d3b8a5c6aebb4d109eadb6 /sys/amd64 | |
| parent | 42f636fdcd3eb6af00c6ed79f699224d198a1787 (diff) | |
| download | FreeBSD-src-6b5199d29b5bc79c9c8348869b6a06b20c7b5cdb.zip FreeBSD-src-6b5199d29b5bc79c9c8348869b6a06b20c7b5cdb.tar.gz | |
Fix a witness panic introduced in r231797.
Reported by: bschmidt
Reviewed by: jhb
Pointy hat to: jkim
MFC after: 3 days
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/acpica/acpi_wakeup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index ec61ed9..44ed980 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -241,8 +241,8 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); - spinlock_enter(); intr_suspend(); + spinlock_enter(); if (savectx(susppcbs[0])) { ctx_fpusave(suspfpusave[0]); @@ -299,8 +299,8 @@ out: #endif mca_resume(); - intr_resume(); spinlock_exit(); + intr_resume(); AcpiSetFirmwareWakingVector(0); |
