From owner-svn-src-head@FreeBSD.ORG  Fri Jun  1 18:18:49 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 284FA1065670;
	Fri,  1 Jun 2012 18:18:49 +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 148098FC16;
	Fri,  1 Jun 2012 18:18:49 +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 q51IImcu035318;
	Fri, 1 Jun 2012 18:18:48 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q51IImh5035315;
	Fri, 1 Jun 2012 18:18:48 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201206011818.q51IImh5035315@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 1 Jun 2012 18:18:48 +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: r236414 - in head/sys: amd64/acpica i386/acpica
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jun 2012 18:18:49 -0000

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