From owner-freebsd-arch@FreeBSD.ORG  Thu Aug 26 17:09:43 2004
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4F93416A4E8; Thu, 26 Aug 2004 17:09:41 +0000 (GMT)
Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B48C643D45; Thu, 26 Aug 2004 17:09:41 +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 i7QH9f8U028419;
	Thu, 26 Aug 2004 10:09:41 -0700
Message-ID: <412E1954.5030908@root.org>
Date: Thu, 26 Aug 2004 10:09:40 -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: arch@freebsd.org
Content-Type: multipart/mixed;
 boundary="------------000200030206080107010709"
Subject: Leave acpi enabled in panic shutdown case?
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussion related to FreeBSD architecture
	<freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Aug 2004 17:09:43 -0000

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

It seems some people may get a 2nd panic when acpi is shutdown after a 
panic.  I think it makes sense not to do the normal shutdown path if 
panicing.  Is the correct way to check for this panicstr != NULL?

The attached patch avoids calling AcpiTerminate() for the panic case.

-Nate

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

Index: acpi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v
retrieving revision 1.189
diff -u -r1.189 acpi.c
--- acpi.c	23 Aug 2004 16:28:42 -0000	1.189
+++ acpi.c	26 Aug 2004 01:37:13 -0000
@@ -1365,7 +1365,7 @@
 	    DELAY(1000000);
 	    printf("ACPI power-off failed - timeout\n");
 	}
-    } else {
+    } else if (panicstr == NULL) {
 	printf("Shutting down ACPI\n");
 	AcpiTerminate();
     }

--------------000200030206080107010709--