SOURCES (LINUX_2_6_14): linux-2.6.14.7-t9-acpi_osl-lkml.patch (NEW...

[mguevara]

Author: mguevara                     Date: Tue Feb 21 13:41:32 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6_14
---- Log message:
- version of 2.6.0-t9-acpi_osl-lkml.patch for 2.6.14.7

---- Files affected:
SOURCES:
   linux-2.6.14.7-t9-acpi_osl-lkml.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/linux-2.6.14.7-t9-acpi_osl-lkml.patch
diff -u /dev/null SOURCES/linux-2.6.14.7-t9-acpi_osl-lkml.patch:1.1.2.1
--- /dev/null	Tue Feb 21 14:41:32 2006
+++ SOURCES/linux-2.6.14.7-t9-acpi_osl-lkml.patch	Tue Feb 21 14:41:27 2006
@@ -0,0 +1,25 @@
+--- linux-2.6.10-rc2/drivers/acpi/osl.c.orig	2004-11-15 02:28:18.000000000 +0100
++++ linux-2.6.10-rc2/drivers/acpi/osl.c	2004-11-19 15:53:57.437348968 +0100
+@@ -40,6 +40,7 @@
+ #include <asm/io.h>
+ #include <acpi/acpi_bus.h>
+ #include <asm/uaccess.h>
++#include <asm/hardirq.h>
+ 
+ #include <linux/efi.h>
+ 
+@@ -308,8 +309,12 @@
+ void
+ acpi_os_sleep(acpi_integer ms)
+ {
+-	current->state = TASK_INTERRUPTIBLE;
+-	schedule_timeout(((signed long) ms * HZ) / 1000);
++	if (!in_atomic()) {
++		current->state = TASK_INTERRUPTIBLE;
++		schedule_timeout(((long)ms * HZ) / 1000);
++	} else {
++		acpi_os_stall((long)ms * 1000);
++	}
+ }
+ 
+ EXPORT_SYMBOL(acpi_os_sleep);
================================================================