diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:43 +0800 |
| commit | 6c1be3bf831c5b1f2ba51425315287df2c350633 (patch) | |
| tree | fd07371829b4b5ea7db114502ac12fd989aa4e2a /drivers/acpi/acpica/dsmethod.c | |
| parent | ada3625ee9203002b2cac60be802dae952ae3e22 (diff) | |
| parent | 3b6aa07b936b09d38c1bfcee1e06845b968df475 (diff) | |
Merge tag 'v3.18.34' into linux-linaro-lsk-v3.18lsk-v3.18-16.05
This is the 3.18.34 stable release
Diffstat (limited to 'drivers/acpi/acpica/dsmethod.c')
| -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 3c7f7378b94d..86ddd0b3a7bf 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(); } } |