From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Fri, 28 Aug 2009 19:29:38 +0000 (+0400)
Subject: ACPICA: Don't switch task then not allowed
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=138d15692bf76841f252d4b836a535cf5f9154e9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ACPICA: Don't switch task then not allowed

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---

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)