From: Tony Luck <tony.luck@xxxxxxxxx> ACPICA commit b8713f71b4023a0396fe61503bbbf5226e5eed1b Some ERDT subtables have 11 and 24 byte reserved fields. Add the ACPI_DMT_BUF11 and ACPI_DMT_BUF24 types to describe these reserved fields in struct acpi_dmtable_info structures. Shorten the ACPI_SUBTABLE_HEADER_16 name to ACPI_SUBTBL_HDR Link: https://github.com/acpica/acpica/commit/b8713f71 Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> --- include/acpi/actbl1.h | 2 +- include/acpi/actbl2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index b403b0b60bf6..6d2cc181e3a4 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -157,7 +157,7 @@ struct acpi_aspt_acpi_mbox_regs { /* Larger subtable header (when Length can exceed 255) */ -struct acpi_subtable_header_16 { +struct acpi_subtbl_hdr_16 { u16 type; u16 length; }; diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 274b3b85b6d7..2c07b097ef9f 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -1764,7 +1764,7 @@ struct acpi_table_mrrm { ******************************************************************************/ struct acpi_mrrm_mem_range_entry { - struct acpi_subtable_header_16 header; + struct acpi_subtbl_hdr_16 header; u32 reserved0; /* Reserved */ u64 addr_base; /* Base addr of the mem range */ u64 addr_len; /* Length of the mem range */ -- 2.43.0
