1 files changed, 1 insertions, 1 deletions

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 9d7febde10a1..09469971472f 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
         do { \
-                if (!in_atomic_preempt_off()) \
+                if (!in_atomic_preempt_off() && !irqs_disabled()) \
                         cond_resched(); \
         } while (0)