git: e887138417fd - stable/13 - arm64: Don't use hex for ID_AA64MMFR2_EL1_op/CR*

The branch stable/13 has been updated by andrew:

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

commit e887138417fd73837b3b6f242a8e765046e1517a
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2023-07-06 13:15:12 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2023-09-25 08:41:33 +0000

    arm64: Don't use hex for ID_AA64MMFR2_EL1_op/CR*
    
    It breaks a future macro that creates the alternative register name
    for old compilers.
    
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D40892
    
    (cherry picked from commit 2134cfe793d67e3bc6ec0713862168452f4ad8f0)
---
 sys/arm64/include/armreg.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index afaf9407217b..80828259f23a 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -1003,11 +1003,11 @@
 
 /* ID_AA64MMFR2_EL1 */
 #define	ID_AA64MMFR2_EL1		MRS_REG(ID_AA64MMFR2_EL1)
-#define	ID_AA64MMFR2_EL1_op0		0x3
-#define	ID_AA64MMFR2_EL1_op1		0x0
-#define	ID_AA64MMFR2_EL1_CRn		0x0
-#define	ID_AA64MMFR2_EL1_CRm		0x7
-#define	ID_AA64MMFR2_EL1_op2		0x2
+#define	ID_AA64MMFR2_EL1_op0		3
+#define	ID_AA64MMFR2_EL1_op1		0
+#define	ID_AA64MMFR2_EL1_CRn		0
+#define	ID_AA64MMFR2_EL1_CRm		7
+#define	ID_AA64MMFR2_EL1_op2		2
 #define	ID_AA64MMFR2_CnP_SHIFT		0
 #define	ID_AA64MMFR2_CnP_MASK		(UL(0xf) << ID_AA64MMFR2_CnP_SHIFT)
 #define	ID_AA64MMFR2_CnP_VAL(x)		((x) & ID_AA64MMFR2_CnP_MASK)