ACPICA: infrastructure: Add new DMT_BUF types and shorten a long name

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@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3643286.iIbC2pHGDl@rjwysocki.net

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index b403b0b60bf6d0abbf8bf5ea111c079618be2a48..6d2cc181e3a430ad83e4bb93e1f76b4612a69505 100644 (file)
--- 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 274b3b85b6d773115dc2ba9619409814f3783684..2c07b097ef9f60b0d6066302e5fcbc9628a0ff5b 100644 (file)
--- 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 */