diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2017-07-10 15:23:02 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-20 16:38:23 +0200 |
| commit | 3ddd3f6a94108a5d2abfaa2a2f809b1520361e5e (patch) | |
| tree | 67d516ff94be10a75764f0bcc442ea95fa20b60b /drivers/acpi/acpica | |
| parent | ff7993a753413b19c1fb9566fc80ddbf5dc785e1 (diff) | |
| download | blackbird-op-linux-3ddd3f6a94108a5d2abfaa2a2f809b1520361e5e.tar.gz blackbird-op-linux-3ddd3f6a94108a5d2abfaa2a2f809b1520361e5e.zip | |
ACPICA: iASL compiler: allow compilation of externals with paths that refer to existing names
ACPICA commit 9a252114197409290813bee570e9d53c22b99d32
This change allows compilation of code like the following:
definition_block (...)
{
External (ABCD.EFGH)
Device (ABCD)
{
Name (IJLK,0)
}
}
but does not allow compilation of code like the following:
definition_block (...)
{
External (ABCD)
Device (ABCD)
{
Name (EFGH,0)
}
}
Link: https://github.com/acpica/acpica/commit/9a252114
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/aclocal.h | 1 | ||||
| -rw-r--r-- | drivers/acpi/acpica/nsaccess.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 822dbc5eee18..bae943b5f377 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -199,6 +199,7 @@ 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 e5f4fa496572..14be12fe9f35 100644 --- a/drivers/acpi/acpica/nsaccess.c +++ b/drivers/acpi/acpica/nsaccess.c @@ -634,6 +634,12 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, this_node->object; } } +#ifdef ACPI_ASL_COMPILER + if (!acpi_gbl_disasm_flag && + (this_node->flags & ANOBJ_IS_EXTERNAL)) { + this_node->flags |= IMPLICIT_EXTERNAL; + } +#endif } /* Special handling for the last segment (num_segments == 0) */ |
