ACPICA: Don't switch task then not allowed
authorAlexey Starikovskiy <astarikovskiy@suse.de>
Fri, 28 Aug 2009 19:29:38 +0000 (23:29 +0400)
committerLen Brown <len.brown@intel.com>
Sat, 29 Aug 2009 18:41:27 +0000 (14:41 -0400)
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
include/acpi/platform/aclinux.h

index fcb8e4b159b1cde3060d27fd1761c898fa0a0250..9d7febde10a172f7bc22f7b72e7ffa6456836788 100644 (file)
@@ -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)