diff options
Diffstat (limited to 'drivers/acpi/events/evmisc.c')
-rw-r--r-- | drivers/acpi/events/evmisc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c index 21cb749d0c75..2d34663dc1ed 100644 --- a/drivers/acpi/events/evmisc.c +++ b/drivers/acpi/events/evmisc.c | |||
@@ -439,7 +439,8 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout) | |||
439 | * Only one thread can acquire the GL at a time, the global_lock_mutex | 439 | * Only one thread can acquire the GL at a time, the global_lock_mutex |
440 | * enforces this. This interface releases the interpreter if we must wait. | 440 | * enforces this. This interface releases the interpreter if we must wait. |
441 | */ | 441 | */ |
442 | status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, 0); | 442 | status = acpi_ex_system_wait_mutex( |
443 | acpi_gbl_global_lock_mutex->mutex.os_mutex, 0); | ||
443 | if (status == AE_TIME) { | 444 | if (status == AE_TIME) { |
444 | if (acpi_ev_global_lock_thread_id == acpi_os_get_thread_id()) { | 445 | if (acpi_ev_global_lock_thread_id == acpi_os_get_thread_id()) { |
445 | acpi_ev_global_lock_acquired++; | 446 | acpi_ev_global_lock_acquired++; |
@@ -448,9 +449,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout) | |||
448 | } | 449 | } |
449 | 450 | ||
450 | if (ACPI_FAILURE(status)) { | 451 | if (ACPI_FAILURE(status)) { |
451 | status = | 452 | status = acpi_ex_system_wait_mutex( |
452 | acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, | 453 | acpi_gbl_global_lock_mutex->mutex.os_mutex, |
453 | timeout); | 454 | timeout); |
454 | } | 455 | } |
455 | if (ACPI_FAILURE(status)) { | 456 | if (ACPI_FAILURE(status)) { |
456 | return_ACPI_STATUS(status); | 457 | return_ACPI_STATUS(status); |
@@ -555,7 +556,7 @@ acpi_status acpi_ev_release_global_lock(void) | |||
555 | /* Release the local GL mutex */ | 556 | /* Release the local GL mutex */ |
556 | acpi_ev_global_lock_thread_id = NULL; | 557 | acpi_ev_global_lock_thread_id = NULL; |
557 | acpi_ev_global_lock_acquired = 0; | 558 | acpi_ev_global_lock_acquired = 0; |
558 | acpi_os_release_mutex(acpi_gbl_global_lock_mutex); | 559 | acpi_os_release_mutex(acpi_gbl_global_lock_mutex->mutex.os_mutex); |
559 | return_ACPI_STATUS(status); | 560 | return_ACPI_STATUS(status); |
560 | } | 561 | } |
561 | 562 | ||