Merge branch 'preempt' into release

2009-09-19 02:10:27 -04:00 · 2009-09-19 02:10:27 -04:00 · 7ef0143e2f
parent 44396a2622 138d15692b
commit 7ef0143e2f
1 changed files with 2 additions and 2 deletions
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@ -149,10 +149,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #define ACPI_FREE(a)            kfree(a)

 /* Used within ACPICA to show where it is safe to preempt execution */
-
+#include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
 	do { \
-		if (!irqs_disabled()) \
+		if (!in_atomic_preempt_off()) \
 			cond_resched(); \
 	} while (0)