ACPICA: Increase total number of possible Owner IDs (67a72420) · Commits · 戴 / test

drivers/acpi/acpica/aclocal.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -134,12 +134,12 @@ struct acpi_namespace_node {
		union acpi_operand_object object; / Interpreter object */
		u8 descriptor_type; /* Differentiate object descriptor types */
		u8 type; /* ACPI Type associated with this name */
		u8 flags; /* Miscellaneous flags */
		acpi_owner_id owner_id; /* Node creator */
		u16 flags; /* Miscellaneous flags */
		union acpi_name_union name; /* ACPI Name, always 4 chars per ACPI spec */
		struct acpi_namespace_node parent; / Parent node */
		struct acpi_namespace_node child; / First child */
		struct acpi_namespace_node peer; / First peer */
		acpi_owner_id owner_id; /* Node creator */

		/*
		* The following fields are used by the ASL compiler and disassembler only

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,8 +153,8 @@ struct acpi_object_method {
		} dispatch;

		u32 aml_length;
		u8 thread_count;
		acpi_owner_id owner_id;
		u8 thread_count;
		};

		/* Flags for info_flags field above */

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,9 +167,9 @@ struct acpi_evaluate_info {
		u32 return_flags; /* Used for return value analysis */
		u32 return_btype; /* Bitmapped type of the returned object */
		u16 param_count; /* Count of the input argument list */
		u16 node_flags; /* Same as Node->Flags */
		u8 pass_number; /* Parser pass number */
		u8 return_object_type; /* Object type of the returned object */
		u8 node_flags; /* Same as Node->Flags */
		u8 flags; /* General flags */
		};

+4 −3

Original line number	Diff line number	Diff line
		@@ -690,18 +690,19 @@ void ACPI_INTERNAL_VAR_XFACE
		acpi_ut_predefined_warning(const char *module_name,
		u32 line_number,
		char *pathname,
		u8 node_flags, const char *format, ...);
		u16 node_flags, const char *format, ...);

		void ACPI_INTERNAL_VAR_XFACE
		acpi_ut_predefined_info(const char *module_name,
		u32 line_number,
		char pathname, u8 node_flags, const char format, ...);
		char *pathname,
		u16 node_flags, const char *format, ...);

		void ACPI_INTERNAL_VAR_XFACE
		acpi_ut_predefined_bios_error(const char *module_name,
		u32 line_number,
		char *pathname,
		u8 node_flags, const char *format, ...);
		u16 node_flags, const char *format, ...);

		void
		acpi_ut_prefixed_namespace_error(const char *module_name,

+4 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,10 @@ acpi_status acpi_db_disassemble_method(char *name)
		}

		status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);
		if (ACPI_FAILURE(status)) {
		return (status);
		}

		walk_state->owner_id = obj_desc->method.owner_id;

		/* Push start scope on scope stack and make it current */