summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/utmutex.c
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2011-03-23 12:26:36 +0300
committerLen Brown <len.brown@intel.com>2011-03-25 11:33:15 +0300
commit749c27639b95c5c4a8185e02a4efb189034944ed (patch)
treebb20d0d20fbc325f676949a4a240beefb9d53f9a /drivers/acpi/acpica/utmutex.c
parent3854c8e32f46ffa6ee0bf2eb01137f5a48b2754f (diff)
downloadlinux-749c27639b95c5c4a8185e02a4efb189034944ed.tar.xz
ACPICA: Fix code divergence of global lock handling
Commit 9cd0314(ACPI / ACPICA: Fix global lock acquisition) was backported into ACPICA code base, and some divergence was introduced. This patch fixed it, - rename acpi_ev_global_lock_pending/acpi_ev_global_lock_pending_lock to acpi_gbl_global_lock_pending/acpi_gbl_global_lock_pending_lock. - move the initialization of acpi_gbl_global_lock_pending_lock from acpi_ut_mutex_initialize to acpi_ev_init_global_lock_handler. Signed-off-by: Lin Ming <ming.m.lin@intel.com> Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/utmutex.c')
-rw-r--r--drivers/acpi/acpica/utmutex.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 519d4ee9b45a..7d797e2baecd 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -93,11 +93,6 @@ acpi_status acpi_ut_mutex_initialize(void)
return_ACPI_STATUS (status);
}
- status = acpi_os_create_lock (&acpi_ev_global_lock_pending_lock);
- if (ACPI_FAILURE (status)) {
- return_ACPI_STATUS (status);
- }
-
/* Mutex for _OSI support */
status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
if (ACPI_FAILURE(status)) {