1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 24fa19a76d70..c687b9979fb2 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -102,7 +102,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                 /* _OSI is optional for now, will be permanent later */
 
-                if (!ACPI_STRCMP(init_val->name, "_OSI")
+                if (!strcmp(init_val->name, "_OSI")
                     && !acpi_gbl_create_osi_method) {
                         continue;
                 }
@@ -180,7 +180,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 /* Build an object around the static string */
 
-                                obj_desc->string.length = (u32)ACPI_STRLEN(val);
+                                obj_desc->string.length = (u32)strlen(val);
                                 obj_desc->string.pointer = val;
                                 obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
                                 break;
@@ -203,7 +203,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 /* Special case for ACPI Global Lock */
 
-                                if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
+                                if (strcmp(init_val->name, "_GL_") == 0) {
                                         acpi_gbl_global_lock_mutex = obj_desc;
 
                                         /* Create additional counting semaphore for global lock */
@@ -304,7 +304,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_SEARCH_PARENT);
+        local_flags = flags &
+            ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_OVERRIDE_IF_FOUND |
+              ACPI_NS_SEARCH_PARENT);
         *return_node = ACPI_ENTRY_NOT_FOUND;
         acpi_gbl_ns_lookup_count++;
 
@@ -547,6 +549,12 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         if (flags & ACPI_NS_ERROR_IF_FOUND) {
                                 local_flags |= ACPI_NS_ERROR_IF_FOUND;
                         }
+
+                        /* Set override flag according to caller */
+
+                        if (flags & ACPI_NS_OVERRIDE_IF_FOUND) {
+                                local_flags |= ACPI_NS_OVERRIDE_IF_FOUND;
+                        }
                 }
 
                 /* Extract one ACPI name from the front of the pathname */