diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-06-29 20:16:57 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-06-29 20:16:57 +0000 |
| commit | d776ccceca14a93812a2f15904c3b09af20ec866 (patch) | |
| tree | 3c4130d38f3eb26390bdfd2c5b63b97ad6b4f369 /source/components | |
| parent | cf46a5c46848b2092d8f2a6125fe23d2b68b4160 (diff) | |
| download | src-vendor/acpica/20180629.tar.gz src-vendor/acpica/20180629.zip | |
Import ACPICA 20180629.vendor/acpica/20180629
Diffstat (limited to 'source/components')
| -rw-r--r-- | source/components/hardware/hwxfsleep.c | 12 | ||||
| -rw-r--r-- | source/components/namespace/nsaccess.c | 7 | ||||
| -rw-r--r-- | source/components/namespace/nseval.c | 4 | ||||
| -rw-r--r-- | source/components/namespace/nssearch.c | 1 |
4 files changed, 8 insertions, 16 deletions
diff --git a/source/components/hardware/hwxfsleep.c b/source/components/hardware/hwxfsleep.c index 8ebb8c1d22c5..b2f856c5f6d3 100644 --- a/source/components/hardware/hwxfsleep.c +++ b/source/components/hardware/hwxfsleep.c @@ -184,17 +184,17 @@ AcpiHwSleepDispatch ( static ACPI_SLEEP_FUNCTIONS AcpiSleepDispatch[] = { - {ACPI_STRUCT_INIT (legacy_function, + {ACPI_STRUCT_INIT (LegacyFunction, ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacySleep)), - ACPI_STRUCT_INIT (extended_function, + ACPI_STRUCT_INIT (ExtendedFunction, AcpiHwExtendedSleep) }, - {ACPI_STRUCT_INIT (legacy_function, + {ACPI_STRUCT_INIT (LegacyFunction, ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWakePrep)), - ACPI_STRUCT_INIT (extended_function, + ACPI_STRUCT_INIT (ExtendedFunction, AcpiHwExtendedWakePrep) }, - {ACPI_STRUCT_INIT (legacy_function, + {ACPI_STRUCT_INIT (Legacy_function, ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWake)), - ACPI_STRUCT_INIT (extended_function, + ACPI_STRUCT_INIT (ExtendedFunction, AcpiHwExtendedWake) } }; diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c index d084c6fedc51..bf530d483025 100644 --- a/source/components/namespace/nsaccess.c +++ b/source/components/namespace/nsaccess.c @@ -781,13 +781,6 @@ AcpiNsLookup ( else { -#ifdef ACPI_ASL_COMPILER - if (!AcpiGbl_DisasmFlag && (ThisNode->Flags & ANOBJ_IS_EXTERNAL)) - { - ThisNode->Flags &= ~IMPLICIT_EXTERNAL; - } -#endif - /* * Sanity typecheck of the target object: * diff --git a/source/components/namespace/nseval.c b/source/components/namespace/nseval.c index 2a7eb8f595ad..8262d992fec5 100644 --- a/source/components/namespace/nseval.c +++ b/source/components/namespace/nseval.c @@ -429,11 +429,11 @@ AcpiNsEvaluate ( Status = AE_OK; } - else if (ACPI_FAILURE(Status)) + else if (ACPI_FAILURE(Status)) { /* If ReturnObject exists, delete it */ - if (Info->ReturnObject) + if (Info->ReturnObject) { AcpiUtRemoveReference (Info->ReturnObject); Info->ReturnObject = NULL; diff --git a/source/components/namespace/nssearch.c b/source/components/namespace/nssearch.c index 02fd8b401f0b..dab4b5704d86 100644 --- a/source/components/namespace/nssearch.c +++ b/source/components/namespace/nssearch.c @@ -545,7 +545,6 @@ AcpiNsSearchAndEnter ( (WalkState && WalkState->Opcode == AML_SCOPE_OP)) { NewNode->Flags |= ANOBJ_IS_EXTERNAL; - NewNode->Flags |= IMPLICIT_EXTERNAL; } #endif |