OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac8fc72
)
ACPICA: Dispatcher: Update thread ID for recursive method calls
author
Prarit Bhargava
<prarit@redhat.com>
Wed, 4 May 2016 05:48:56 +0000
(13:48 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 11 May 2016 09:21:20 +0000
(11:21 +0200)
commit
93d68841a23a5779cef6fb9aa0ef32e7c5bd00da
upstream.
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>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/acpi/acpica/dsmethod.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/acpica/dsmethod.c
b/drivers/acpi/acpica/dsmethod.c
index
bc32f31
..
28c50c6
100644
(file)
--- a/
drivers/acpi/acpica/dsmethod.c
+++ b/
drivers/acpi/acpica/dsmethod.c
@@
-417,6
+417,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();
}
}