diff options
author | Prarit Bhargava <prarit@redhat.com> | 2016-05-04 13:48:56 +0800 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-05-17 13:42:58 -0400 |
commit | a10c059ad73b3b84c349592e72d445d9c73a1e27 (patch) | |
tree | 773d77f9410d573f30dcbc47a71da1a2c38edb1e | |
parent | d15451da634fffa57e013f7c2a9f7db6c65a9a1e (diff) |
ACPICA: Dispatcher: Update thread ID for recursive method calls
[ Upstream commit 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da ]
ACPICA commit 7a3bd2d962f221809f25ddb826c9e551b916eb25
Set the mutex owner thread ID.
Original patch from: Prarit Bhargava <prarit@redhat.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=115121
Link: https://github.com/acpica/acpica/commit/7a3bd2d9
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Tested-by: Andy Lutomirski <luto@kernel.org> # On a Dell XPS 13 9350
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r-- | drivers/acpi/acpica/dsmethod.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index d72565a3c646..adff30d5ba33 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -412,6 +412,9 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, obj_desc->method.mutex->mutex. original_sync_level = obj_desc->method.mutex->mutex.sync_level; + + obj_desc->method.mutex->mutex.thread_id = + acpi_os_get_thread_id(); } } |