Skip to content

Commit

Permalink
ACPICA: Undo accidental checkin of not-fully-tested mutex changes
Browse files Browse the repository at this point in the history
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Bob Moore authored and Len Brown committed Apr 22, 2008
1 parent 941f48b commit 57345ee
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions drivers/acpi/executer/exmutex.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
} else {
thread->acquired_mutex_list = obj_desc->mutex.next;
}
return;
}

/*******************************************************************************
Expand Down Expand Up @@ -299,17 +298,6 @@ 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--;
Expand Down Expand Up @@ -415,9 +403,6 @@ 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) {

Expand All @@ -426,7 +411,6 @@ 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);
}

Expand Down

0 comments on commit 57345ee

Please sign in to comment.