From owner-svn-src-all@FreeBSD.ORG  Mon Mar 19 21:47:51 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 36A38106566C;
	Mon, 19 Mar 2012 21:47:51 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 21A168FC0C;
	Mon, 19 Mar 2012 21:47:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JLloqZ087760;
	Mon, 19 Mar 2012 21:47:50 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JLloX8087758;
	Mon, 19 Mar 2012 21:47:50 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201203192147.q2JLloX8087758@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 19 Mar 2012 21:47:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233208 - head/sys/amd64/acpica
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2012 21:47:51 -0000

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);