From ce08ac257db95fcf17fd718241008f3ab37e4ef2 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 25 Sep 2008 21:40:30 +0400
Subject: [PATCH] --- yaml --- r: 117304 b: refs/heads/master c:
 8bd108d14604d9c95000751e6c6ecbd11ea6ed40 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/acpi/parser/psloop.c    | 2 ++
 trunk/include/acpi/acmacros.h         | 5 +++++
 trunk/include/acpi/platform/aclinux.h | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d168ae7b53ff..879837cef9c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eec935490172dbfa1a32647f9deb2b66a66f2741
+refs/heads/master: 8bd108d14604d9c95000751e6c6ecbd11ea6ed40
diff --git a/trunk/drivers/acpi/parser/psloop.c b/trunk/drivers/acpi/parser/psloop.c
index c06238e55d98..4647039a0d8a 100644
--- a/trunk/drivers/acpi/parser/psloop.c
+++ b/trunk/drivers/acpi/parser/psloop.c
@@ -719,6 +719,8 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
 		*op = NULL;
 	}
 
+	ACPI_PREEMPTION_POINT();
+
 	return_ACPI_STATUS(AE_OK);
 }
 
diff --git a/trunk/include/acpi/acmacros.h b/trunk/include/acpi/acmacros.h
index 2106f9136cce..a1e3240bf460 100644
--- a/trunk/include/acpi/acmacros.h
+++ b/trunk/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/trunk/include/acpi/platform/aclinux.h b/trunk/include/acpi/platform/aclinux.h
index 9af464598682..029c8c06c151 100644
--- a/trunk/include/acpi/platform/aclinux.h
+++ b/trunk/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__ */