summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/utilities/utdelete.c
diff options
context:
space:
mode:
authorLen Brown2007-05-10 05:01:59 +0200
committerLen Brown2007-05-10 05:01:59 +0200
commit262a7a28de060f3a63cae20035876d6f22fd7670 (patch)
tree80c687704cb57fafe11a2e40fbc9e6b2f095b604 /drivers/acpi/utilities/utdelete.c
parentRevert "Execute AML Notify() requests on stack." (diff)
downloadkernel-qcow2-linux-262a7a28de060f3a63cae20035876d6f22fd7670.tar.gz
kernel-qcow2-linux-262a7a28de060f3a63cae20035876d6f22fd7670.tar.xz
kernel-qcow2-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 'drivers/acpi/utilities/utdelete.c')
-rw-r--r--drivers/acpi/utilities/utdelete.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 673a0caa4073..f777cebdc46d 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -170,6 +170,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
acpi_os_delete_mutex(object->mutex.os_mutex);
acpi_gbl_global_lock_mutex = NULL;
} else {
+ acpi_ex_unlink_mutex(object);
acpi_os_delete_mutex(object->mutex.os_mutex);
}
break;