2 files changed, 16 insertions, 95 deletions

diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index b3914395851b..0396bd4819f1 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -352,101 +352,6 @@ acpi_ex_create_region(u8 * aml_start,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_create_table_region
- *
- * PARAMETERS:  walk_state          - Current state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a new data_table_region object
- *
- ******************************************************************************/
-
-acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
-{
-        acpi_status status;
-        union acpi_operand_object **operand = &walk_state->operands[0];
-        union acpi_operand_object *obj_desc;
-        struct acpi_namespace_node *node;
-        union acpi_operand_object *region_obj2;
-        acpi_native_uint table_index;
-        struct acpi_table_header *table;
-
-        ACPI_FUNCTION_TRACE(ex_create_table_region);
-
-        /* Get the Node from the object stack  */
-
-        node = walk_state->op->common.node;
-
-        /*
-         * If the region object is already attached to this node,
-         * just return
-         */
-        if (acpi_ns_get_attached_object(node)) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Find the ACPI table */
-
-        status = acpi_tb_find_table(operand[1]->string.pointer,
-                                    operand[2]->string.pointer,
-                                    operand[3]->string.pointer, &table_index);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Create the region descriptor */
-
-        obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_REGION);
-        if (!obj_desc) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
-        region_obj2 = obj_desc->common.next_object;
-        region_obj2->extra.region_context = NULL;
-
-        status = acpi_get_table_by_index(table_index, &table);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Init the region from the operands */
-
-        obj_desc->region.space_id = REGION_DATA_TABLE;
-        obj_desc->region.address =
-            (acpi_physical_address) ACPI_TO_INTEGER(table);
-        obj_desc->region.length = table->length;
-        obj_desc->region.node = node;
-        obj_desc->region.flags = AOPOBJ_DATA_VALID;
-
-        /* Install the new region object in the parent Node */
-
-        status = acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_REGION);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-
-        status = acpi_ev_initialize_region(obj_desc, FALSE);
-        if (ACPI_FAILURE(status)) {
-                if (status == AE_NOT_EXIST) {
-                        status = AE_OK;
-                } else {
-                        goto cleanup;
-                }
-        }
-
-        obj_desc->region.flags |= AOPOBJ_SETUP_COMPLETE;
-
-      cleanup:
-
-        /* Remove local reference to the object */
-
-        acpi_ut_remove_reference(obj_desc);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ex_create_processor
  *
  * PARAMETERS:  walk_state          - Current state
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index b8d035c00b61..7c70938eef89 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -85,6 +85,7 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
         } else {
                 thread->acquired_mutex_list = obj_desc->mutex.next;
         }
+        return;
 }
 
 /*******************************************************************************
@@ -298,6 +299,17 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc)
                 return (AE_NOT_ACQUIRED);
         }
 
+        /* No obj_desc->Mutex.owner_thread for Global Lock */
+
+        /*
+         * Mutex to be released must be at the head of acquired list to prevent
+         * deadlock. (The head of the list is the last mutex acquired.)
+         */
+        if (obj_desc->mutex.owner_thread &&
+            (obj_desc != obj_desc->mutex.owner_thread->acquired_mutex_list)) {
+                return (AE_AML_MUTEX_ORDER);
+        }
+
         /* Match multiple Acquires with multiple Releases */
 
         obj_desc->mutex.acquisition_depth--;
@@ -403,6 +415,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         }
 
         status = acpi_ex_release_mutex_object(obj_desc);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
 
         if (obj_desc->mutex.acquisition_depth == 0) {
 
@@ -411,6 +426,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
                 walk_state->thread->current_sync_level =
                     obj_desc->mutex.original_sync_level;
         }
+
         return_ACPI_STATUS(status);
 }