Commit a0b12d7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix a fallout of a recent ACPI properties management update and
  work around a compiler bug in ACPICA:

   - Fix a recent coding mistake causing __acpi_node_get_property_reference()
     arguments to be put in an incorrect order (Sunil V L)

   - Work around bogus -Wstringop-overread warning on LoongArch since
     GCC 11 in ACPICA (Xi Ruoyao)"

* tag 'acpi-6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: Work around bogus -Wstringop-overread warning since GCC 11
  ACPI: property: Fix argument order in __acpi_node_get_property_reference()
parents 85db0c0a 114cbd67

drivers/acpi/acpica/tbprint.c

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ acpi_tb_print_table_header(acpi_physical_address address, 
{

	struct acpi_table_header local_header;



#pragma GCC diagnostic push

#if defined(__GNUC__) && __GNUC__ >= 11

#pragma GCC diagnostic ignored "-Wstringop-overread"

#endif



	if (ACPI_COMPARE_NAMESEG(header->signature, ACPI_SIG_FACS)) {



		/* FACS only has signature and length fields */
@@ -143,4 +148,5 @@ acpi_tb_print_table_header(acpi_physical_address address, 
			   local_header.asl_compiler_id,

			   local_header.asl_compiler_revision));

	}

#pragma GCC diagnostic pop

}

drivers/acpi/property.c

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode, 
				       size_t num_args,

				       struct fwnode_reference_args *args)

{

	return acpi_fwnode_get_reference_args(fwnode, propname, NULL, index, num_args, args);

	return acpi_fwnode_get_reference_args(fwnode, propname, NULL, num_args, index, args);

}

EXPORT_SYMBOL_GPL(__acpi_node_get_property_reference);