diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2016-09-07 14:07:16 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-10 02:43:02 +0200 |
| commit | 441ad11d078f35093ceaf510742df423c2d89a3b (patch) | |
| tree | 5fc790f4b64005881c5ec0eb8ccc408867d76361 /drivers/acpi/acpica/psparse.c | |
| parent | 74f51b80a0c4ff84fbeb7f12ea43ce66934d29aa (diff) | |
| download | op-kernel-dev-441ad11d078f35093ceaf510742df423c2d89a3b.zip op-kernel-dev-441ad11d078f35093ceaf510742df423c2d89a3b.tar.gz | |
ACPICA: Dispatcher: Fix a mutex issue for method auto serialization
ACPICA commit fd305eda14f1a1e684edef4fac53f194bf00ed3f
This patch fixes an issue with acpi_ds_auto_serialized_method().
The parser will invoke acpi_ex_release_all_mutexes(), which in return
cause mutexes held in ACPI_ERROR_METHOD() failed. Lv Zheng.
Link: https://bugs.acpica.org/show_bug.cgi?id=1324
Link: https://github.com/acpica/acpica/commit/fd305eda
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: Greg White <gwhite@kupulau.com>
Tested-by: Dutch Guy <lucht_piloot@gmx.net>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/psparse.c')
| -rw-r--r-- | drivers/acpi/acpica/psparse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c index 3aa9162..1ce26d9 100644 --- a/drivers/acpi/acpica/psparse.c +++ b/drivers/acpi/acpica/psparse.c @@ -537,9 +537,11 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) /* Either the method parse or actual execution failed */ + acpi_ex_exit_interpreter(); ACPI_ERROR_METHOD("Method parse/execution failed", walk_state->method_node, NULL, status); + acpi_ex_enter_interpreter(); /* Check for possible multi-thread reentrancy problem */ |
