Skip to content

Commit 57f5cf6

Browse files
AlisonSchofieldgregkh
authored andcommitted
acpi/hmat: Update acpi_hmat_type enum with ACPI_HMAT_TYPE_PROXIMITY
ACPI 6.3 changed the subtable "Memory Subsystem Address Range Structure" to "Memory Proximity Domain Attributes Structure". Updating and renaming of the structure was included in commit: ACPICA: ACPI 6.3: HMAT updates (9a8d961) Rename the enum type to match the subtable and structure naming. Signed-off-by: Alison Schofield <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e174e78 commit 57f5cf6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/acpi/hmat/hmat.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ static int __init hmat_parse_subtable(union acpi_subtable_headers *header,
411411
return -EINVAL;
412412

413413
switch (hdr->type) {
414-
case ACPI_HMAT_TYPE_ADDRESS_RANGE:
414+
case ACPI_HMAT_TYPE_PROXIMITY:
415415
return hmat_parse_proximity_domain(header, end);
416416
case ACPI_HMAT_TYPE_LOCALITY:
417417
return hmat_parse_locality(header, end);
@@ -649,7 +649,7 @@ static __init int hmat_init(void)
649649
goto out_put;
650650
}
651651

652-
for (i = ACPI_HMAT_TYPE_ADDRESS_RANGE; i < ACPI_HMAT_TYPE_RESERVED; i++) {
652+
for (i = ACPI_HMAT_TYPE_PROXIMITY; i < ACPI_HMAT_TYPE_RESERVED; i++) {
653653
if (acpi_table_parse_entries(ACPI_SIG_HMAT,
654654
sizeof(struct acpi_table_hmat), i,
655655
hmat_parse_subtable, 0) < 0) {

include/acpi/actbl1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ struct acpi_table_hmat {
13951395
/* Values for HMAT structure types */
13961396

13971397
enum acpi_hmat_type {
1398-
ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subsystem address range */
1398+
ACPI_HMAT_TYPE_PROXIMITY = 0, /* Memory proximity domain attributes */
13991399
ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */
14001400
ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */
14011401
ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */

0 commit comments

Comments
 (0)