Merge back ACPICA material for v4.19.
This commit is contained in:
Коммит
16c5b08572
|
@ -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 */
|
||||
|
|
|
@ -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:
|
||||
*
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
Загрузка…
Ссылка в новой задаче