Page MenuHomeFreeBSD
Files F174237508

D59181.diff
No OneTemporary
Actions

D59181.diff
View Options

diff --git a/sys/arm64/apple/apple_aic.c b/sys/arm64/apple/apple_aic.c
--- 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
--- 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

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 2, 3:04 PM (13 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39988240
Default Alt Text
D59181.diff (910 B)

Event Timeline