Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 193486
b: refs/heads/master
c: a7499bc
h: refs/heads/master
v: v3
  • Loading branch information
Bob Moore authored and Len Brown committed Apr 20, 2010
1 parent 8112934 commit 29724cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 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: 21e44ba85b0bc9ec970dd2ddb37966ef8c23ad24
refs/heads/master: a7499bc84eabb200f9dc23770a46d9a31b1e763a
21 changes: 11 additions & 10 deletions trunk/drivers/acpi/acpica/exmutex.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
(obj_desc->mutex.prev)->mutex.next = obj_desc->mutex.next;

/*
* Migrate the previous sync level associated with this mutex to the
* previous mutex on the list so that it may be preserved. This handles
* the case where several mutexes have been acquired at the same level,
* but are not released in opposite order.
* Migrate the previous sync level associated with this mutex to
* the previous mutex on the list so that it may be preserved.
* This handles the case where several mutexes have been acquired
* at the same level, but are not released in opposite order.
*/
(obj_desc->mutex.prev)->mutex.original_sync_level =
obj_desc->mutex.original_sync_level;
Expand All @@ -101,8 +101,8 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
*
* FUNCTION: acpi_ex_link_mutex
*
* PARAMETERS: obj_desc - The mutex to be linked
* Thread - Current executing thread object
* PARAMETERS: obj_desc - The mutex to be linked
* Thread - Current executing thread object
*
* RETURN: None
*
Expand Down Expand Up @@ -138,9 +138,9 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
*
* FUNCTION: acpi_ex_acquire_mutex_object
*
* PARAMETERS: time_desc - Timeout in milliseconds
* PARAMETERS: Timeout - Timeout in milliseconds
* obj_desc - Mutex object
* Thread - Current thread state
* thread_id - Current thread state
*
* RETURN: Status
*
Expand Down Expand Up @@ -234,7 +234,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
return_ACPI_STATUS(AE_BAD_PARAMETER);
}

/* Must have a valid thread ID */
/* Must have a valid thread state struct */

if (!walk_state->thread) {
ACPI_ERROR((AE_INFO,
Expand Down Expand Up @@ -435,14 +435,15 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,

owner_thread->current_sync_level = previous_sync_level;
}

return_ACPI_STATUS(status);
}

/*******************************************************************************
*
* FUNCTION: acpi_ex_release_all_mutexes
*
* PARAMETERS: Thread - Current executing thread object
* PARAMETERS: Thread - Current executing thread object
*
* RETURN: Status
*
Expand Down

0 comments on commit 29724cf

Please sign in to comment.