diff options
Diffstat (limited to 'drivers/acpi/utilities/utmutex.c')
-rw-r--r-- | drivers/acpi/utilities/utmutex.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c index a80b97cb2e56..0699b6be62b6 100644 --- a/drivers/acpi/utilities/utmutex.c +++ b/drivers/acpi/utilities/utmutex.c | |||
@@ -159,7 +159,7 @@ acpi_ut_create_mutex ( | |||
159 | if (!acpi_gbl_mutex_info[mutex_id].mutex) { | 159 | if (!acpi_gbl_mutex_info[mutex_id].mutex) { |
160 | status = acpi_os_create_semaphore (1, 1, | 160 | status = acpi_os_create_semaphore (1, 1, |
161 | &acpi_gbl_mutex_info[mutex_id].mutex); | 161 | &acpi_gbl_mutex_info[mutex_id].mutex); |
162 | acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED; | 162 | acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED; |
163 | acpi_gbl_mutex_info[mutex_id].use_count = 0; | 163 | acpi_gbl_mutex_info[mutex_id].use_count = 0; |
164 | } | 164 | } |
165 | 165 | ||
@@ -196,7 +196,7 @@ acpi_ut_delete_mutex ( | |||
196 | status = acpi_os_delete_semaphore (acpi_gbl_mutex_info[mutex_id].mutex); | 196 | status = acpi_os_delete_semaphore (acpi_gbl_mutex_info[mutex_id].mutex); |
197 | 197 | ||
198 | acpi_gbl_mutex_info[mutex_id].mutex = NULL; | 198 | acpi_gbl_mutex_info[mutex_id].mutex = NULL; |
199 | acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED; | 199 | acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED; |
200 | 200 | ||
201 | return_ACPI_STATUS (status); | 201 | return_ACPI_STATUS (status); |
202 | } | 202 | } |
@@ -274,7 +274,7 @@ acpi_ut_acquire_mutex ( | |||
274 | this_thread_id, acpi_ut_get_mutex_name (mutex_id))); | 274 | this_thread_id, acpi_ut_get_mutex_name (mutex_id))); |
275 | 275 | ||
276 | acpi_gbl_mutex_info[mutex_id].use_count++; | 276 | acpi_gbl_mutex_info[mutex_id].use_count++; |
277 | acpi_gbl_mutex_info[mutex_id].owner_id = this_thread_id; | 277 | acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id; |
278 | } | 278 | } |
279 | else { | 279 | else { |
280 | ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, | 280 | ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, |
@@ -322,7 +322,7 @@ acpi_ut_release_mutex ( | |||
322 | /* | 322 | /* |
323 | * Mutex must be acquired in order to release it! | 323 | * Mutex must be acquired in order to release it! |
324 | */ | 324 | */ |
325 | if (acpi_gbl_mutex_info[mutex_id].owner_id == ACPI_MUTEX_NOT_ACQUIRED) { | 325 | if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) { |
326 | ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, | 326 | ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, |
327 | "Mutex [%s] is not acquired, cannot release\n", | 327 | "Mutex [%s] is not acquired, cannot release\n", |
328 | acpi_ut_get_mutex_name (mutex_id))); | 328 | acpi_ut_get_mutex_name (mutex_id))); |
@@ -359,7 +359,7 @@ acpi_ut_release_mutex ( | |||
359 | 359 | ||
360 | /* Mark unlocked FIRST */ | 360 | /* Mark unlocked FIRST */ |
361 | 361 | ||
362 | acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED; | 362 | acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED; |
363 | 363 | ||
364 | status = acpi_os_signal_semaphore (acpi_gbl_mutex_info[mutex_id].mutex, 1); | 364 | status = acpi_os_signal_semaphore (acpi_gbl_mutex_info[mutex_id].mutex, 1); |
365 | 365 | ||