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

Merge back ACPICA changes for v5.2.

parents c5781ffb 6c6a828f

arch/x86/boot/compressed/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static unsigned long get_acpi_srat_table(void) 
		if (acpi_table) {

			header = (struct acpi_table_header *)acpi_table;



			if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_SRAT))

			if (ACPI_COMPARE_NAMESEG(header->signature, ACPI_SIG_SRAT))

				return acpi_table;

		}

		entry += size;

drivers/acpi/acpi_configfs.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str) 
	if (!h)

		return -EINVAL;



	return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h->signature);

	return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);

}



static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
@@ -170,7 +170,7 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg, 
	if (!h)

		return -EINVAL;



	return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h->asl_compiler_id);

	return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);

}



static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,

drivers/acpi/acpica/aclocal.h

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state); 
 * expected_return_btypes - Allowed type(s) for the return value

 */

struct acpi_name_info {

	char name[ACPI_NAME_SIZE];

	char name[ACPI_NAMESEG_SIZE];

	u16 argument_list;

	u8 expected_btypes;

};
@@ -370,7 +370,7 @@ typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node * 
					      converted_object);



struct acpi_simple_repair_info {

	char name[ACPI_NAME_SIZE];

	char name[ACPI_NAMESEG_SIZE];

	u32 unexpected_btypes;

	u32 package_index;

	acpi_object_converter object_converter;

drivers/acpi/acpica/dbexec.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ acpi_db_execute(char *name, char **args, acpi_object_type *types, u32 flags) 


			/* Dump a _PLD buffer if present */



			if (ACPI_COMPARE_NAME

			if (ACPI_COMPARE_NAMESEG

			    ((ACPI_CAST_PTR

			      (struct acpi_namespace_node,

			       acpi_gbl_db_method_info.method)->name.ascii),

drivers/acpi/acpica/dbnames.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ acpi_status acpi_db_find_name_in_namespace(char *name_arg) 
	char acpi_name[5] = "____";

	char *acpi_name_ptr = acpi_name;



	if (strlen(name_arg) > ACPI_NAME_SIZE) {

	if (strlen(name_arg) > ACPI_NAMESEG_SIZE) {

		acpi_os_printf("Name must be no longer than 4 characters\n");

		return (AE_OK);

	}