diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-18 10:39:21 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-18 10:39:21 +0200 |
commit | ffba17bb335d6598de613791f8997a5774455068 (patch) | |
tree | 10aca50de0e6910b0e01a49d6d9ebf3eb057903f /drivers | |
parent | 56a0b978d42f58c7e3ba715cf65af487d427524d (diff) | |
parent | 35b9ad840892d979dbeffe702dae95a3cbefa07b (diff) | |
download | linux-ffba17bb335d6598de613791f8997a5774455068.tar.bz2 |
Merge branch 'acpi-tables'
* acpi-tables:
ACPI: HMAT: ACPI_HMAT_MEMORY_PD_VALID is deprecated since ACPI-6.3
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/hmat/hmat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/hmat/hmat.c index 8f9a28a870b0..8b0de8a3c647 100644 --- a/drivers/acpi/hmat/hmat.c +++ b/drivers/acpi/hmat/hmat.c @@ -403,7 +403,7 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade pr_info("HMAT: Memory Flags:%04x Processor Domain:%d Memory Domain:%d\n", p->flags, p->processor_PD, p->memory_PD); - if (p->flags & ACPI_HMAT_MEMORY_PD_VALID) { + if (p->flags & ACPI_HMAT_MEMORY_PD_VALID && hmat_revision == 1) { target = find_mem_target(p->memory_PD); if (!target) { pr_debug("HMAT: Memory Domain missing from SRAT\n"); |