diff options
| author | njl <njl@FreeBSD.org> | 2003-09-30 19:12:37 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2003-09-30 19:12:37 +0000 |
| commit | 603a67c9fe0cdaf078a67b490a7bd93c73fa1d9f (patch) | |
| tree | ab446be37db6f5a9844ff8f7e26028dac476094f /sys/dev/acpica | |
| parent | 9af19ad623068c766f4ba6aa3bf5a0cc234d58ba (diff) | |
| download | FreeBSD-src-603a67c9fe0cdaf078a67b490a7bd93c73fa1d9f.zip FreeBSD-src-603a67c9fe0cdaf078a67b490a7bd93c73fa1d9f.tar.gz | |
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:
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdSchedule.c | 10 |
1 files changed, 1 insertions, 9 deletions
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; } |
