svn commit: r233208 - head/sys/amd64/acpica

[Jung-uk Kim]

Author: jkim
Date: Mon Mar 19 21:47:50 2012
New Revision: 233208
URL: http://svn.freebsd.org/changeset/base/233208

Log:
  Fix a witness panic introduced in r231797.
  
  Reported by:	bschmidt
  Reviewed by:	jhb
  Pointy hat to:	jkim
  MFC after:	3 days

Modified:
  head/sys/amd64/acpica/acpi_wakeup.c

Modified: head/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/amd64/acpica/acpi_wakeup.c	Mon Mar 19 21:34:11 2012	(r233207)
+++ head/sys/amd64/acpica/acpi_wakeup.c	Mon Mar 19 21:47:50 2012	(r233208)
@@ -241,8 +241,8 @@ acpi_sleep_machdep(struct acpi_softc *sc
 
 	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);