Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151004
b: refs/heads/master
c: 315c728
h: refs/heads/master
v: v3
  • Loading branch information
Bob Moore authored and Len Brown committed May 27, 2009
1 parent ae42ca3 commit e53a2bd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 10a3b461a258f52b17fb8e35edf3625726eca9a8
refs/heads/master: 315c728887f198d12eb6ec7ef9d88483018c11cb
15 changes: 11 additions & 4 deletions trunk/drivers/acpi/acpica/exmutex.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,14 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
}

/*
* The sync level of the mutex must be less than or equal to the current
* sync level
* The sync level of the mutex must be equal to the current sync level. In
* other words, the current level means that at least one mutex at that
* level is currently being held. Attempting to release a mutex of a
* different level can only mean that the mutex ordering rule is being
* violated. This behavior is clarified in ACPI 4.0 specification.
*/
if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
if (obj_desc->mutex.sync_level !=
walk_state->thread->current_sync_level) {
ACPI_ERROR((AE_INFO,
"Cannot release Mutex [%4.4s], SyncLevel mismatch: mutex %d current %d",
acpi_ut_get_node_name(obj_desc->mutex.node),
Expand All @@ -423,10 +427,13 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
walk_state->thread->acquired_mutex_list->mutex.original_sync_level;

status = acpi_ex_release_mutex_object(obj_desc);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}

if (obj_desc->mutex.acquisition_depth == 0) {

/* Restore the original sync_level */
/* Restore the previous sync_level */

walk_state->thread->current_sync_level = previous_sync_level;
}
Expand Down

0 comments on commit e53a2bd

Please sign in to comment.