4 files changed, 14 insertions, 17 deletions

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 1683e5c5b94c..1cbe61905824 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -231,8 +231,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                  * Obtain the method mutex if necessary. Do not acquire mutex for a
                  * recursive call.
                  */
-                if (acpi_os_get_thread_id() !=
-                    obj_desc->method.mutex->mutex.owner_thread_id) {
+                if (!walk_state ||
+                    !obj_desc->method.mutex->mutex.owner_thread ||
+                    (walk_state->thread !=
+                     obj_desc->method.mutex->mutex.owner_thread)) {
                         /*
                          * Acquire the method mutex. This releases the interpreter if we
                          * block (and reacquires it before it returns)
@@ -246,14 +248,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                         }
 
                         /* Update the mutex and walk info and save the original sync_level */
-                        obj_desc->method.mutex->mutex.owner_thread_id =
-                                acpi_os_get_thread_id();
 
                         if (walk_state) {
                                 obj_desc->method.mutex->mutex.
                                     original_sync_level =
                                     walk_state->thread->current_sync_level;
 
+                                obj_desc->method.mutex->mutex.owner_thread =
+                                    walk_state->thread;
                                 walk_state->thread->current_sync_level =
                                     obj_desc->method.sync_level;
                         } else {
@@ -567,7 +569,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                         acpi_os_release_mutex(method_desc->method.mutex->mutex.
                                               os_mutex);
-                        method_desc->method.mutex->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+                        method_desc->method.mutex->mutex.owner_thread = NULL;
                 }
         }
 
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 6c6104a7a247..fc9da4879cbf 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
                     ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) &&
                      (op->common.parent->common.aml_opcode !=
                       AML_VAR_PACKAGE_OP)
-                     && (op->common.parent->common.aml_opcode !=
-                         AML_NAME_OP))) {
+                     && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {
                         walk_state->result_obj = obj_desc;
                 }
         }
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index e4073e05a75c..71503c036f7c 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -556,10 +556,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                          * indicate this to the interpreter, set the
                                          * object to the root
                                          */
-                                        obj_desc =
-                                            ACPI_CAST_PTR(union
-                                                          acpi_operand_object,
-                                                          acpi_gbl_root_node);
+                                        obj_desc = ACPI_CAST_PTR(union
+                                                                 acpi_operand_object,
+                                                                 acpi_gbl_root_node);
                                         status = AE_OK;
                                 } else {
                                         /*
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 16c8e38b51ef..5afcdd9c7449 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
  *
  ******************************************************************************/
 
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
-                                                  union acpi_parse_object
-                                                  *origin,
-                                                  union acpi_operand_object
-                                                  *method_desc,
-                                                  struct acpi_thread_state
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                  *origin, union acpi_operand_object
+                                                  *method_desc, struct acpi_thread_state
                                                   *thread)
 {
         struct acpi_walk_state *walk_state;