Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

1 files changed, 2 insertions, 2 deletions

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index fcb8e4b159b1..9d7febde10a1 100644
--- 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)