diff options
| author |   Erik Schmauss <erik.schmauss@intel.com> | 2017-06-05 16:41:55 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:25:25 +0200 |
| commit | a9d8ea79d7464352820973b237f1d192afc3c14c (patch) | |
| tree | 3eca51537a06a88afdb9a8eca6124218e0544715 /drivers/acpi/acpica/aclocal.h | |
| parent | ACPICA: Disassembler: add external op to namespace on first pass (diff) | |
| download | linux-dev-a9d8ea79d7464352820973b237f1d192afc3c14c.tar.xz linux-dev-a9d8ea79d7464352820973b237f1d192afc3c14c.zip | |
ACPICA: Disassembler: allow conflicting external declarations to be emitted.
ACPICA commit 0ed9f2e2ccc112439eaa355b5952a05d6fdb7814
An external declaration is a conflicting declaration when a name has
been declared as an external and a named object within the same file.
Link: https://github.com/acpica/acpica/commit/0ed9f2e2
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/aclocal.h')
| -rw-r--r-- | drivers/acpi/acpica/aclocal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 2a8394fe199e..8ddd3b20e0c6 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -1181,6 +1181,7 @@ struct acpi_external_list { #define ACPI_EXT_INTERNAL_PATH_ALLOCATED 0x04 /* Deallocate internal path on completion */ #define ACPI_EXT_EXTERNAL_EMITTED 0x08 /* External() statement has been emitted */ #define ACPI_EXT_ORIGIN_FROM_OPCODE 0x10 /* External came from a External() opcode */ +#define ACPI_EXT_CONFLICTING_DECLARATION 0x20 /* External has a conflicting declaration within AML */ struct acpi_external_file { char *path; |