git: aa3b5d79b2ac - stable/13 - Pass the ACPI ID when reading the ACPI domain

The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=aa3b5d79b2acc508cca63c24251d65f4d2d76fa5

commit aa3b5d79b2acc508cca63c24251d65f4d2d76fa5
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2021-10-18 09:04:06 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2021-12-14 10:58:01 +0000

    Pass the ACPI ID when reading the ACPI domain
    
    The ACPI ID may not be the same as the FreeBSD CPU id. Use the former
    when finding the CPU domain as there is no requirement for it to be
    identical to the latter.
    
    Reported by:    dch, kevans
    Reviewed by:    kevans
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D32546
    
    (cherry picked from commit 4fb002805e0dc0d08825bce65a0f4e533c53ec54)
---
 sys/arm64/arm64/mp_machdep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c
index 67542bbb9e4a..cfd5da3118c1 100644
--- a/sys/arm64/arm64/mp_machdep.c
+++ b/sys/arm64/arm64/mp_machdep.c
@@ -570,7 +570,7 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg)
 		domain = 0;
 #ifdef NUMA
 		if (vm_ndomains > 1)
-			domain = acpi_pxm_get_cpu_locality(*cpuid);
+			domain = acpi_pxm_get_cpu_locality(intr->Uid);
 #endif
 		if (start_cpu(id, intr->ArmMpidr, domain)) {
 			MPASS(cpuid_to_pcpu[id] != NULL);