Browse Source

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>
Alexey Starikovskiy 16 years ago
parent
commit
8bd108d146
3 changed files with 13 additions and 0 deletions
  1. 2 0
      drivers/acpi/parser/psloop.c
  2. 5 0
      include/acpi/acmacros.h
  3. 6 0
      include/acpi/platform/aclinux.h

+ 2 - 0
drivers/acpi/parser/psloop.c

@@ -719,6 +719,8 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
 		*op = NULL;
 		*op = NULL;
 	}
 	}
 
 
+	ACPI_PREEMPTION_POINT();
+
 	return_ACPI_STATUS(AE_OK);
 	return_ACPI_STATUS(AE_OK);
 }
 }
 
 

+ 5 - 0
include/acpi/acmacros.h

@@ -685,4 +685,9 @@ struct acpi_integer_overlay {
 
 
 #endif				/* ACPI_DBG_TRACK_ALLOCATIONS */
 #endif				/* ACPI_DBG_TRACK_ALLOCATIONS */
 
 
+/* Preemption point */
+#ifndef ACPI_PREEMPTION_POINT
+#define ACPI_PREEMPTION_POINT() /* no preemption */
+#endif
+
 #endif				/* ACMACROS_H */
 #endif				/* ACMACROS_H */

+ 6 - 0
include/acpi/platform/aclinux.h

@@ -53,6 +53,7 @@
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/ctype.h>
+#include <linux/sched.h>
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/atomic.h>
 #include <asm/div64.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_ALLOCATE_ZEROED(a)	acpi_os_allocate_zeroed(a)
 #define ACPI_FREE(a)		kfree(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__ */
 #endif				/* __ACLINUX_H__ */