diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:21 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:21 -0500 |
| commit | f0e5ed7f323db4e47b51da4a23fad8245c173081 (patch) | |
| tree | 27f5ff70329a41bb2bce16813bcf8832ce75c2ff /include/acpi | |
| parent | 8800c0ebf5e8363dab66647512dcef5b83203dec (diff) | |
| parent | 5f7748cf91558a5026ded5be93c5bf6c1ac34edf (diff) | |
| download | linux-f0e5ed7f323db4e47b51da4a23fad8245c173081.tar.gz linux-f0e5ed7f323db4e47b51da4a23fad8245c173081.tar.bz2 linux-f0e5ed7f323db4e47b51da4a23fad8245c173081.zip | |
Pull bugzilla-5534 into release branch
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acinterp.h | 3 | ||||
| -rw-r--r-- | include/acpi/acobject.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h index ce7c9d653910..73967c8152d3 100644 --- a/include/acpi/acinterp.h +++ b/include/acpi/acinterp.h @@ -253,7 +253,8 @@ 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); +void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc, + struct acpi_thread_state *thread); /* * exprep - ACPI AML execution - prep utilities diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h index 04e9735a6742..5206d61d74a6 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 */ - struct acpi_thread_state *owner_thread; /* Current owner of the mutex */ + acpi_thread_id owner_thread_id; /* 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 */ |