git: 93a08bf12cf5 - main - arm64: Move the CNTV_CTL_EL0 fields to armreg.h

The branch main has been updated by andrew:

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

commit 93a08bf12cf501d03f9938fb813466525b708eea
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2026-09-08 00:00:42 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2026-09-08 03:05:27 +0000

    arm64: Move the CNTV_CTL_EL0 fields to armreg.h
    
    They are architecturally defined, so should be in the common location.
    
    Reviewed by:    emaste, Kajetan Puchalski <kajetan.puchalski@arm.com>
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D59181
---
 sys/arm64/apple/apple_aic.c | 3 ---
 sys/arm64/include/armreg.h  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/arm64/apple/apple_aic.c b/sys/arm64/apple/apple_aic.c
index 683339369a87..932571b1ec85 100644
--- a/sys/arm64/apple/apple_aic.c
+++ b/sys/arm64/apple/apple_aic.c
@@ -93,9 +93,6 @@
 #define	AIC_FIQ_VM_TIMER_PEN	(1 << 1)
 #define	AIC_FIQ_VM_TIMER_BITS	(AIC_FIQ_VM_TIMER_VEN | AIC_FIQ_VM_TIMER_PEN)
 
-#define CNTV_CTL_ENABLE		(1 << 0)
-#define CNTV_CTL_IMASK		(1 << 1)
-#define CNTV_CTL_ISTATUS	(1 << 2)
 #define	CNTV_CTL_BITS		\
     (CNTV_CTL_ENABLE | CNTV_CTL_IMASK | CNTV_CTL_ISTATUS)
 
diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index d8d695a39477..386869d6024d 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -314,6 +314,9 @@
 #define	CNTV_CTL_EL0_CRn	14
 #define	CNTV_CTL_EL0_CRm	3
 #define	CNTV_CTL_EL0_op2	1
+#define	CNTV_CTL_ENABLE		(1 << 0)
+#define	CNTV_CTL_IMASK		(1 << 1)
+#define	CNTV_CTL_ISTATUS	(1 << 2)
 
 /* CNTV_CTL_EL02 - Counter-timer Virtual Timer Control register */
 #define	CNTV_CTL_EL02_op0	3