Merge branch 'preempt' into release

git-mirror · Sep 19, 2009 · 7ef0143 · 7ef0143
2 parents 44396a2 + 138d156
commit 7ef0143
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)