Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a61e9f6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back ACPICA changes for 4.19.

parents 73c2a01c 16c5b085

drivers/acpi/acpica/aclocal.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/acpi/acpica/nsaccess.c

+0 −7
Original line number Diff line number Diff line
@@ -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:

			 *

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

include/acpi/acpixf.h

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