The branch main has been updated by andrew:

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

commit 86bafddd61aba115bc46bcf1d7e0afb125850b5f
Author:     Andrew Turner <and...@freebsd.org>
AuthorDate: 2024-06-10 14:58:22 +0000
Commit:     Andrew Turner <and...@freebsd.org>
CommitDate: 2024-06-10 15:16:10 +0000

    arm64: Fix indentation to be consistent
    
    Adjust the mair_el1 macro indentation to be consistent with the
    surrounding macros.
    
    Reviewed by:    emaste
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D45524
---
 sys/arm64/include/armreg.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index 7bdb28aad1e5..194731c98902 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -1505,13 +1505,13 @@
 #define         ID_ISAR5_VCMA_IMPL             (UL(0x1) << ID_ISAR5_VCMA_SHIFT)
 
 /* MAIR_EL1 - Memory Attribute Indirection Register */
-#define        MAIR_ATTR_MASK(idx)     (UL(0xff) << ((n)* 8))
-#define        MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8))
-#define         MAIR_DEVICE_nGnRnE     UL(0x00)
-#define         MAIR_DEVICE_nGnRE      UL(0x04)
-#define         MAIR_NORMAL_NC         UL(0x44)
-#define         MAIR_NORMAL_WT         UL(0xbb)
-#define         MAIR_NORMAL_WB         UL(0xff)
+#define        MAIR_ATTR_MASK(idx)             (UL(0xff) << ((n)* 8))
+#define        MAIR_ATTR(attr, idx)            ((attr) << ((idx) * 8))
+#define         MAIR_DEVICE_nGnRnE             UL(0x00)
+#define         MAIR_DEVICE_nGnRE              UL(0x04)
+#define         MAIR_NORMAL_NC                 UL(0x44)
+#define         MAIR_NORMAL_WT                 UL(0xbb)
+#define         MAIR_NORMAL_WB                 UL(0xff)
 
 /* MDCCINT_EL1 */
 #define        MDCCINT_EL1                     MRS_REG(MDCCINT_EL1)

Reply via email to