aboutsummaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorAlexey Starikovskiy2008-09-25 21:40:30 +0400
committerLen Brown2008-10-22 23:14:41 -0400
commit8bd108d14604d9c95000751e6c6ecbd11ea6ed40 (patch)
treeaf101e1f12330fe76d5a973851ea84fb1c2eb220 /include/acpi
parenteec935490172dbfa1a32647f9deb2b66a66f2741 (diff)
ACPICA: add preemption point after each opcode parse
Reference: http://marc.info/?l=linux-acpi&m=122236382701062&w=2 Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acmacros.h5
-rw-r--r--include/acpi/platform/aclinux.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index 2106f9136cce..a1e3240bf460 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -685,4 +685,9 @@ struct acpi_integer_overlay {
#endif /* ACPI_DBG_TRACK_ALLOCATIONS */
+/* Preemption point */
+#ifndef ACPI_PREEMPTION_POINT
+#define ACPI_PREEMPTION_POINT() /* no preemption */
+#endif
+
#endif /* ACMACROS_H */
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 9af464598682..029c8c06c151 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -53,6 +53,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/ctype.h>
+#include <linux/sched.h>
#include <asm/system.h>
#include <asm/atomic.h>
#include <asm/div64.h>
@@ -137,4 +138,9 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
#define ACPI_ALLOCATE_ZEROED(a) acpi_os_allocate_zeroed(a)
#define ACPI_FREE(a) kfree(a)
+/*
+ * We need to show where it is safe to preempt execution of ACPICA
+ */
+#define ACPI_PREEMPTION_POINT() cond_resched()
+
#endif /* __ACLINUX_H__ */