summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2009-08-28 23:29:38 +0400
committerLen Brown <len.brown@intel.com>2009-08-29 22:41:27 +0400
commit138d15692bf76841f252d4b836a535cf5f9154e9 (patch)
treedf5d81076d4e4c74d51f3ed16146f245f34e8f8e /include/acpi
parent326ba5010a5429a5a528b268b36a5900d4ab0eba (diff)
downloadlinux-138d15692bf76841f252d4b836a535cf5f9154e9.tar.xz
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>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/platform/aclinux.h4
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)