git: 406a74f780ab - main - bhyve: Use the new spelling of MPIDR_Aff*

The branch main has been updated by andrew:

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

commit 406a74f780ab110137011d304ac9212a31bf6364
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2026-10-09 14:53:25 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2026-10-09 14:59:37 +0000

    bhyve: Use the new spelling of MPIDR_Aff*
    
    Fixes:  6bf6fe1d70e7 ("arm64: Fix the MPIDR_EL1 field names")
     Sponsored by:  Arm Ltd
---
 usr.sbin/bhyve/aarch64/bhyverun_machdep.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c
index 311170c6952b..f38c719a71a7 100644
--- a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c
+++ b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c
@@ -395,9 +395,9 @@ bhyve_init_platform(struct vmctx *ctx, struct vcpu *bsp)
 		error = vm_get_register(fbsdrun_vcpu(cpu), VM_REG_GUEST_MPIDR_EL1,
 		    &mpidr);
 		assert(error == 0);
-#define	MPIDR_AFF_MASK	(MPIDR_AFF0_MASK | MPIDR_AFF1_MASK | MPIDR_AFF2_MASK | MPIDR_AFF3_MASK)
-		cpu_to_mpidr[cpu] = mpidr & MPIDR_AFF_MASK;
-#undef MPIDR_AFF_MASK
+#define	MPIDR_Aff_MASK	(MPIDR_Aff0_MASK | MPIDR_Aff1_MASK | MPIDR_Aff2_MASK | MPIDR_Aff3_MASK)
+		cpu_to_mpidr[cpu] = mpidr & MPIDR_Aff_MASK;
+#undef MPIDR_Aff_MASK
 	}
 
 	bootrom = get_config_value("bootrom");