Module Name: src
Committed By: drochner
Date: Tue Mar 31 17:17:47 UTC 2009
Modified Files:
src/sys/dev/acpi/acpica: OsdSchedule.c OsdSynch.c
Log Message:
avoid tsleep also during shutdown (and in particular ACPI poweroff),
should fix PR kern/39141 by Takahiro Kambe and PR port-i386/41110
by Reinoud Zandijk
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpica/OsdSchedule.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpica/OsdSynch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpica/OsdSchedule.c
diff -u src/sys/dev/acpi/acpica/OsdSchedule.c:1.9 src/sys/dev/acpi/acpica/OsdSchedule.c:1.10
--- src/sys/dev/acpi/acpica/OsdSchedule.c:1.9 Fri Jan 30 12:51:03 2009
+++ src/sys/dev/acpi/acpica/OsdSchedule.c Tue Mar 31 17:17:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSchedule.c,v 1.9 2009/01/30 12:51:03 jmcneill Exp $ */
+/* $NetBSD: OsdSchedule.c,v 1.10 2009/03/31 17:17:47 drochner Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.9 2009/01/30 12:51:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.10 2009/03/31 17:17:47 drochner Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -165,7 +165,7 @@
{
ACPI_FUNCTION_TRACE(__func__);
- if (cold || acpi_suspended)
+ if (cold || doing_shutdown || acpi_suspended)
DELAY(Milliseconds * 1000);
else {
mutex_enter(&acpi_osd_sleep_mtx);
Index: src/sys/dev/acpi/acpica/OsdSynch.c
diff -u src/sys/dev/acpi/acpica/OsdSynch.c:1.11 src/sys/dev/acpi/acpica/OsdSynch.c:1.12
--- src/sys/dev/acpi/acpica/OsdSynch.c:1.11 Fri Jan 30 12:51:03 2009
+++ src/sys/dev/acpi/acpica/OsdSynch.c Tue Mar 31 17:17:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSynch.c,v 1.11 2009/01/30 12:51:03 jmcneill Exp $ */
+/* $NetBSD: OsdSynch.c,v 1.12 2009/03/31 17:17:47 drochner Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.11 2009/01/30 12:51:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.12 2009/03/31 17:17:47 drochner Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -183,7 +183,7 @@
if (as == NULL)
return_ACPI_STATUS(AE_BAD_PARAMETER);
- if (cold || acpi_suspended)
+ if (cold || doing_shutdown || acpi_suspended)
return_ACPI_STATUS(AE_OK);
/* A timeout of 0xFFFF means "forever". */
