svn commit: r233582 - stable/9/sys/amd64/acpica

[Jung-uk Kim]

Author: jkim
Date: Wed Mar 28 00:06:52 2012
New Revision: 233582
URL: http://svn.freebsd.org/changeset/base/233582

Log:
  MFC:	r233208, r233249
  
  Fix a witness panic.  We cannot enter critical section here.

Modified:
  stable/9/sys/amd64/acpica/acpi_wakeup.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- stable/9/sys/amd64/acpica/acpi_wakeup.c	Tue Mar 27 23:59:48 2012	(r233581)
+++ stable/9/sys/amd64/acpica/acpi_wakeup.c	Wed Mar 28 00:06:52 2012	(r233582)
@@ -223,6 +223,7 @@ acpi_sleep_machdep(struct acpi_softc *sc
 #ifdef SMP
 	cpuset_t	wakeup_cpus;
 #endif
+	register_t	rf;
 	ACPI_STATUS	status;
 	int		ret;
 
@@ -241,7 +242,7 @@ acpi_sleep_machdep(struct acpi_softc *sc
 
 	AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc));
 
-	spinlock_enter();
+	rf = intr_disable();
 	intr_suspend();
 
 	if (savectx(susppcbs[0])) {
@@ -300,7 +301,7 @@ out:
 
 	mca_resume();
 	intr_resume();
-	spinlock_exit();
+	intr_restore(rf);
 
 	AcpiSetFirmwareWakingVector(0);