From owner-freebsd-current@FreeBSD.ORG  Thu Aug 19 01:03:51 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 710D616A4CE
	for <current@freebsd.org>; Thu, 19 Aug 2004 01:03:51 +0000 (GMT)
Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3582743D46
	for <current@freebsd.org>; Thu, 19 Aug 2004 01:03:51 +0000 (GMT)
	(envelope-from nate@root.org)
Received: from [10.0.0.34] (adsl-67-127-84-57.dsl.snfc21.pacbell.net
	[67.127.84.57])
	by www.cryptography.com (8.12.8/8.12.8) with ESMTP id i7J13j8U024215;
	Wed, 18 Aug 2004 18:03:46 -0700
Message-ID: <4123FC71.8060308@root.org>
Date: Wed, 18 Aug 2004 18:03:45 -0700
From: Nate Lawson <nate@root.org>
User-Agent: Mozilla Thunderbird 0.7 (X11/20040702)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: =?ISO-8859-1?Q?S=F8ren_Schmidt?= <sos@DeepCore.dk>
Content-Type: multipart/mixed;
 boundary="------------080609030808010903010205"
cc: current@freebsd.org
Subject: Re: suspend/resume panic in ACPI..
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Aug 2004 01:03:51 -0000

This is a multi-part message in MIME format.
--------------080609030808010903010205
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Try the attached patch.

-Nate

--------------080609030808010903010205
Content-Type: text/plain;
 name="sos.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sos.diff"

Index: sys/i386/acpica/acpi_wakeup.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/acpica/acpi_wakeup.c,v
retrieving revision 1.37
diff -u -r1.37 acpi_wakeup.c
--- sys/i386/acpica/acpi_wakeup.c	5 Aug 2004 06:29:12 -0000	1.37
+++ sys/i386/acpica/acpi_wakeup.c	19 Aug 2004 01:01:40 -0000
@@ -189,7 +189,6 @@
 	AcpiSetFirmwareWakingVector(sc->acpi_wakephys);
 
 	ef = read_eflags();
-	ACPI_DISABLE_IRQS();
 
 	/* Create Identity Mapping */
 	if ((p = curproc) == NULL)
@@ -209,6 +208,7 @@
 	ret_addr = 0;
 	if (acpi_savecpu()) {
 		/* Execute Sleep */
+		ACPI_DISABLE_IRQS();
 		intr_suspend();
 
 		p_gdt = (struct region_descriptor *)

--------------080609030808010903010205--