From ba36768b22ec3afb4384e9b2da436b5bb7494f1c Mon Sep 17 00:00:00 2001
From: Nate Lawson <njl@FreeBSD.org>
Date: Tue, 21 Sep 2004 17:19:38 +0000
Subject: Don't disable acpi in shutdown if we're panicing (panicstr != NULL). 
 This may help with double panics.

---
 sys/dev/acpica/acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 7c874dab9806..6769b063d258 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -1365,7 +1365,7 @@ acpi_shutdown_final(void *arg, int howto)
 	    DELAY(1000000);
 	    printf("ACPI power-off failed - timeout\n");
 	}
-    } else {
+    } else if (panicstr == NULL) {
 	printf("Shutting down ACPI\n");
 	AcpiTerminate();
     }
-- 
cgit v1.3