From d52ea9c90e325b668fafb3daad7ce75f0be43c88 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Sat, 1 May 2010 18:25:33 +0000 Subject: [PATCH] Trying to fix #5861. As we are now so early in the boot process, we should really avoid functions that wait. The change in r36565 from waiting on condvar seems to have moved the problems over to the snooze method. We now use spinlocks instead of snoozing while booting. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36569 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/acpi/oshaiku.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c index 75f1003d88..a17a671fda 100644 --- a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c +++ b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c @@ -115,6 +115,7 @@ #include +#include #include #include #include @@ -819,7 +820,10 @@ void AcpiOsSleep(ACPI_INTEGER milliseconds) { DEBUG_FUNCTION_F("milliseconds: %lu", milliseconds); - snooze(milliseconds * 1000); + if (gKernelStartup) + spin(milliseconds * 1000); + else + snooze(milliseconds * 1000); }