From: Mark Brown <broonie@kernel.org>
Date: Thu, 18 Aug 2022 21:36:12 +0000 (+0100)
Subject: arm64/sysreg: Guard SYS_FIELD_ macros for asm
X-Git-Tag: v6.0-rc3~16^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a10edea4efbba4e8756f493781e953dd3592f24a;p=thirdparty%2Flinux.git

arm64/sysreg: Guard SYS_FIELD_ macros for asm

The SYS_FIELD_ macros are not safe for assembly contexts, move them inside
the guarded section.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220818213613.733091-3-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index c670026770156..818df938a7ad0 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -1210,8 +1210,6 @@
 	par;								\
 })
 
-#endif
-
 #define SYS_FIELD_GET(reg, field, val)		\
 		 FIELD_GET(reg##_##field##_MASK, val)
 
@@ -1221,4 +1219,6 @@
 #define SYS_FIELD_PREP_ENUM(reg, field, val)		\
 		 FIELD_PREP(reg##_##field##_MASK, reg##_##field##_##val)
 
+#endif
+
 #endif	/* __ASM_SYSREG_H */