diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-10 10:49:21 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-10 10:49:21 +0400 |
| commit | 3dd6786f55219f87fd33e153669600d715ca9270 (patch) | |
| tree | 305f8389a93bf86df79f4cf8fb0050b1d6008939 /include | |
| parent | f697b677620d04d8c77841745727de85f7e948b1 (diff) | |
| parent | 88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff) | |
| download | linux-3dd6786f55219f87fd33e153669600d715ca9270.tar.xz | |
Pull bugzilla-8385 into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acinterp.h | 9 | ||||
| -rw-r--r-- | include/acpi/acobject.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h index 440983019993..ce7c9d653910 100644 --- a/include/acpi/acinterp.h +++ b/include/acpi/acinterp.h @@ -253,8 +253,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread); -void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc, - struct acpi_thread_state *thread); +void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc); /* * exprep - ACPI AML execution - prep utilities @@ -446,10 +445,14 @@ acpi_ex_copy_integer_to_buffer_field(union acpi_operand_object *source_desc, /* * exutils - interpreter/scanner utilities */ -acpi_status acpi_ex_enter_interpreter(void); +void acpi_ex_enter_interpreter(void); void acpi_ex_exit_interpreter(void); +void acpi_ex_reacquire_interpreter(void); + +void acpi_ex_relinquish_interpreter(void); + void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc); u8 acpi_ex_acquire_global_lock(u32 rule); diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h index 5206d61d74a6..04e9735a6742 100644 --- a/include/acpi/acobject.h +++ b/include/acpi/acobject.h @@ -155,7 +155,7 @@ struct acpi_object_event { struct acpi_object_mutex { ACPI_OBJECT_COMMON_HEADER u8 sync_level; /* 0-15, specified in Mutex() call */ u16 acquisition_depth; /* Allow multiple Acquires, same thread */ - acpi_thread_id owner_thread_id; /* Current owner of the mutex */ + struct acpi_thread_state *owner_thread; /* Current owner of the mutex */ acpi_mutex os_mutex; /* Actual OS synchronization object */ union acpi_operand_object *prev; /* Link for list of acquired mutexes */ union acpi_operand_object *next; /* Link for list of acquired mutexes */ |