Page MenuHomeFreeBSD
Files F168251984

D59175.diff
No OneTemporary
Actions

D59175.diff
View Options

diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c
--- a/sys/arm64/arm64/identcpu.c
+++ b/sys/arm64/arm64/identcpu.c
@@ -1295,8 +1295,8 @@
MRS_FIELD_VALUE_END,
};
-static const struct mrs_field_value id_aa64mmfr1_cmovw[] = {
- MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, CMOVW, NONE, IMPL),
+static const struct mrs_field_value id_aa64mmfr1_cmow[] = {
+ MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, CMOW, NONE, IMPL),
MRS_FIELD_VALUE_END,
};
@@ -1386,7 +1386,7 @@
static const struct mrs_field id_aa64mmfr1_fields[] = {
MRS_FIELD(ID_AA64MMFR1, ECBHB, false, MRS_LOWER, 0, id_aa64mmfr1_ecbhb),
- MRS_FIELD(ID_AA64MMFR1, CMOVW, false, MRS_LOWER, 0, id_aa64mmfr1_cmovw),
+ MRS_FIELD(ID_AA64MMFR1, CMOW, false, MRS_LOWER, 0, id_aa64mmfr1_cmow),
MRS_FIELD(ID_AA64MMFR1, TIDCP1, false, MRS_LOWER, 0,
id_aa64mmfr1_tidcp1),
MRS_FIELD(ID_AA64MMFR1, nTLBPA, false, MRS_LOWER, 0,
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
@@ -1515,12 +1515,12 @@
#define ID_AA64MMFR1_TIDCP1_VAL(x) ((x) & ID_AA64MMFR1_TIDCP1_MASK)
#define ID_AA64MMFR1_TIDCP1_NONE (UL(0x0) << ID_AA64MMFR1_TIDCP1_SHIFT)
#define ID_AA64MMFR1_TIDCP1_IMPL (UL(0x1) << ID_AA64MMFR1_TIDCP1_SHIFT)
-#define ID_AA64MMFR1_CMOVW_SHIFT 56
-#define ID_AA64MMFR1_CMOVW_WIDTH 4
-#define ID_AA64MMFR1_CMOVW_MASK (UL(0xf) << ID_AA64MMFR1_CMOVW_SHIFT)
-#define ID_AA64MMFR1_CMOVW_VAL(x) ((x) & ID_AA64MMFR1_CMOVW_MASK)
-#define ID_AA64MMFR1_CMOVW_NONE (UL(0x0) << ID_AA64MMFR1_CMOVW_SHIFT)
-#define ID_AA64MMFR1_CMOVW_IMPL (UL(0x1) << ID_AA64MMFR1_CMOVW_SHIFT)
+#define ID_AA64MMFR1_CMOW_SHIFT 56
+#define ID_AA64MMFR1_CMOW_WIDTH 4
+#define ID_AA64MMFR1_CMOW_MASK (UL(0xf) << ID_AA64MMFR1_CMOW_SHIFT)
+#define ID_AA64MMFR1_CMOW_VAL(x) ((x) & ID_AA64MMFR1_CMOW_MASK)
+#define ID_AA64MMFR1_CMOW_NONE (UL(0x0) << ID_AA64MMFR1_CMOW_SHIFT)
+#define ID_AA64MMFR1_CMOW_IMPL (UL(0x1) << ID_AA64MMFR1_CMOW_SHIFT)
#define ID_AA64MMFR1_ECBHB_SHIFT 60
#define ID_AA64MMFR1_ECBHB_WIDTH 4
#define ID_AA64MMFR1_ECBHB_MASK (UL(0xf) << ID_AA64MMFR1_ECBHB_SHIFT)

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 4:49 AM (5 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37314797
Default Alt Text
D59175.diff (2 KB)

Event Timeline