ACPICA: Revert "iASL: change processing of external op namespace nodes for correctness" (da7f7126) · Commits · 戴 / test

Revert commit (ACPICA: iASL: change processing of external op namespace nodes for correctness; upstream ACPICA commit aa866a9b4f24bbec9f158d10325b486d7d12d90f). This was done in order to allow more relaxed usage of ASL external declarations. Signed-off-by:

Erik Schmauss <erik.schmauss@intel.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/acpica/nsaccess.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -608,18 +608,17 @@ 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) */

		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:
		*

drivers/acpi/acpica/nssearch.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message