Skip to content

Commit a0b12d7

Browse files
committed
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()
2 parents 85db0c0 + 114cbd6 commit a0b12d7

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/acpi/acpica/tbprint.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ acpi_tb_print_table_header(acpi_physical_address address,
9595
{
9696
struct acpi_table_header local_header;
9797

98+
#pragma GCC diagnostic push
99+
#if defined(__GNUC__) && __GNUC__ >= 11
100+
#pragma GCC diagnostic ignored "-Wstringop-overread"
101+
#endif
102+
98103
if (ACPI_COMPARE_NAMESEG(header->signature, ACPI_SIG_FACS)) {
99104

100105
/* FACS only has signature and length fields */
@@ -143,4 +148,5 @@ acpi_tb_print_table_header(acpi_physical_address address,
143148
local_header.asl_compiler_id,
144149
local_header.asl_compiler_revision));
145150
}
151+
#pragma GCC diagnostic pop
146152
}

drivers/acpi/property.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,
11071107
size_t num_args,
11081108
struct fwnode_reference_args *args)
11091109
{
1110-
return acpi_fwnode_get_reference_args(fwnode, propname, NULL, index, num_args, args);
1110+
return acpi_fwnode_get_reference_args(fwnode, propname, NULL, num_args, index, args);
11111111
}
11121112
EXPORT_SYMBOL_GPL(__acpi_node_get_property_reference);
11131113

0 commit comments

Comments
 (0)