Merge branch 'preempt' into release

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index fcb8e4b159b1cde3060d27fd1761c898fa0a0250..9d7febde10a172f7bc22f7b72e7ffa6456836788 100644 (file)
--- 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)