1 files changed, 16 insertions, 20 deletions

diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index c1c6c236df9a..b2ef6730be81 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -195,31 +195,27 @@ acpi_status acpi_ns_root_initialize(void)
                                 obj_desc->mutex.sync_level =
                                     (u8) (ACPI_TO_INTEGER(val) - 1);
 
-                                if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
-
-                                        /* Create a counting semaphore for the global lock */
+                                /* Create a mutex */
+
+                                status =
+                                    acpi_os_create_mutex(&obj_desc->mutex.
+                                                         os_mutex);
+                                if (ACPI_FAILURE(status)) {
+                                        acpi_ut_remove_reference(obj_desc);
+                                        goto unlock_and_exit;
+                                }
 
-                                        status =
-                                            acpi_os_create_semaphore
-                                            (ACPI_NO_UNIT_LIMIT, 1,
-                                             &acpi_gbl_global_lock_semaphore);
-                                        if (ACPI_FAILURE(status)) {
-                                                acpi_ut_remove_reference
-                                                    (obj_desc);
-                                                goto unlock_and_exit;
-                                        }
+                                /* Special case for ACPI Global Lock */
 
-                                        /* Mark this mutex as very special */
+                                if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
+                                        acpi_gbl_global_lock_mutex =
+                                            obj_desc->mutex.os_mutex;
 
-                                        obj_desc->mutex.os_mutex =
-                                            ACPI_GLOBAL_LOCK;
-                                } else {
-                                        /* Create a mutex */
+                                        /* Create additional counting semaphore for global lock */
 
                                         status =
-                                            acpi_os_create_mutex(&obj_desc->
-                                                                 mutex.
-                                                                 os_mutex);
+                                            acpi_os_create_semaphore(1, 1,
+                                                                     &acpi_gbl_global_lock_semaphore);
                                         if (ACPI_FAILURE(status)) {
                                                 acpi_ut_remove_reference
                                                     (obj_desc);