From 603a67c9fe0cdaf078a67b490a7bd93c73fa1d9f Mon Sep 17 00:00:00 2001 From: njl Date: Tue, 30 Sep 2003 19:12:37 +0000 Subject: Revert 1.24. It causes a hang on shutdown for Marcel. This is due to AcpiEnterSleepState() calling a long AcpiOsStall() with interrupts disabled. This fix will instead be added to ACPI-CA. PR: Submitted by: Reviewed by: Approved by: Obtained from: MFC after: --- sys/dev/acpica/Osd/OsdSchedule.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'sys/dev/acpica') diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c index 9c5195c..ac29c1e 100644 --- a/sys/dev/acpica/Osd/OsdSchedule.c +++ b/sys/dev/acpica/Osd/OsdSchedule.c @@ -262,15 +262,7 @@ AcpiOsStall (UINT32 Microseconds) { ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - /* - * Maximum length for stall is 100 us. If longer, assume caller - * really meant "sleep". - */ - if (Microseconds <= 100) - DELAY(Microseconds); - else - AcpiOsSleep(Microseconds / 1000, Microseconds % 1000); - + DELAY(Microseconds); return_VOID; } -- cgit v1.1