Merge back ACPICA material for 4.19.

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 51c386bf230d5ae024ced7de2da090f78e415da7..c5367bf5487fcf3a1ac466e990675871a7af16ae 100644 (file)
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -165,7 +165,6 @@ struct acpi_namespace_node {
 #define ANOBJ_EVALUATED                 0x20   /* Set on first evaluation of node */
 #define ANOBJ_ALLOCATED_BUFFER          0x40   /* Method AML buffer is dynamic (install_method) */
 
-#define IMPLICIT_EXTERNAL               0x02   /* iASL only: This object created implicitly via External */
 #define ANOBJ_IS_EXTERNAL               0x08   /* iASL only: This object created via External() */
 #define ANOBJ_METHOD_NO_RETVAL          0x10   /* iASL only: Method has no return value */
 #define ANOBJ_METHOD_SOME_NO_RETVAL     0x20   /* iASL only: Method has at least one return value */

diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 220a718fbce986cafb8a31ec3d0565e72cf48d97..83a593e2155d7a71db823ab341acf903fb30cbea 100644 (file)
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -613,13 +613,6 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                /* Special handling for the last segment (num_segments == 0) */
 
                else {
-#ifdef ACPI_ASL_COMPILER
-                       if (!acpi_gbl_disasm_flag
-                           && (this_node->flags & ANOBJ_IS_EXTERNAL)) {
-                               this_node->flags &= ~IMPLICIT_EXTERNAL;
-                       }
-#endif
-
                        /*
                         * Sanity typecheck of the target object:
                         *

diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index e9c9a63bb6a4f4218f417ab28489895c7067990d..f594ab75a5fe72cfd2be8b392dcb108edb243ad8 100644 (file)
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -381,7 +381,6 @@ acpi_ns_search_and_enter(u32 target_name,
        if (flags & ACPI_NS_EXTERNAL ||
            (walk_state && walk_state->opcode == AML_SCOPE_OP)) {
                new_node->flags |= ANOBJ_IS_EXTERNAL;
-               new_node->flags |= IMPLICIT_EXTERNAL;
        }
 #endif
 

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 48d84f0d9547ad8d2c24057a9e780e74dec8045c..88072c92ace25af8a89b0966adf07018b914ca24 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -12,7 +12,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20180531
+#define ACPI_CA_VERSION                 0x20180629
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>