Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jul 2024 12:38:34 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: c73d1e81b68e - stable/13 - arm64: Fix indentation to be consistent
Message-ID:  <202407151238.46FCcYIF062001@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by andrew:

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

commit c73d1e81b68e04bd3b5967e616439992c644e842
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-06-10 14:58:22 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-07-15 12:35:21 +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
    
    (cherry picked from commit 86bafddd61aba115bc46bcf1d7e0afb125850b5f)
---
 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 053f7a6d0afc..1a194075990d 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -1499,13 +1499,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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407151238.46FCcYIF062001>