diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-09 23:01:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-09 23:01:59 -0400 |
| commit | 262a7a28de060f3a63cae20035876d6f22fd7670 (patch) | |
| tree | 80c687704cb57fafe11a2e40fbc9e6b2f095b604 /include/acpi | |
| parent | 40d07080e585396dc58bc64befa1de0695318b3b (diff) | |
| download | linux-262a7a28de060f3a63cae20035876d6f22fd7670.tar.gz linux-262a7a28de060f3a63cae20035876d6f22fd7670.tar.bz2 linux-262a7a28de060f3a63cae20035876d6f22fd7670.zip | |
Revert "ACPICA: fix AML mutex re-entrancy"
This reverts commit c0d127b56937c3e72c2b1819161d2f6718eee877.
These changes to AML locking were made to allow
Notify handlers to be called on the stack
and not deadlock. However, that scheme turns
out to be flawed and was reverted by the previous commit,
so this commit restores the locking to it previous design.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acinterp.h | 3 | ||||
| -rw-r--r-- | include/acpi/acobject.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h index 73967c8152d3..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 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 */ |