Commit 522778cd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20190816.
  ACPICA: Add "Windows 2019" string to _OSI support.
  ACPICA: Differentiate Windows 8.1 from Windows 8.
  ACPICA: Fully deploy ACPI_PRINTF_LIKE macro
  ACPICA: iASL,acpi_dump: Improve y/n query
  ACPICA: Fix issues with arg types within printf format strings
  ACPICA: Macros: remove pointer math on a null pointer
  ACPICA: Increase total number of possible Owner IDs
  ACPICA: Debugger: remove redundant assignment on obj_desc
parents 4c4cdc4c 71bb4d9a

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

drivers/acpi/acpica/acobject.h

+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 */

drivers/acpi/acpica/acstruct.h

+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 */

};

drivers/acpi/acpica/acutils.h

+7 −3
Original line number Diff line number Diff line
@@ -686,22 +686,26 @@ void acpi_ut_delete_address_lists(void); 
/*

 * utxferror - various error/warning output functions

 */

ACPI_PRINTF_LIKE(5)

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, ...);



ACPI_PRINTF_LIKE(5)

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, ...);



ACPI_PRINTF_LIKE(5)

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,

drivers/acpi/acpica/dbhistry.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void acpi_db_display_history(void) 


	for (i = 0; i < acpi_gbl_num_history; i++) {

		if (acpi_gbl_history_buffer[history_index].command) {

			acpi_os_printf("%3ld %s\n",

			acpi_os_printf("%3u %s\n",

				       acpi_gbl_history_buffer[history_index].

				       cmd_num,

				       acpi_gbl_history_buffer[history_index].

CRA Git | Maintained and supported by SUSTech CRA and CCSE