Skip to content

Commit a10edea

Browse files
brooniewilldeacon
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 02e483f commit a10edea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,8 +1210,6 @@
12101210
par; \
12111211
})
12121212

1213-
#endif
1214-
12151213
#define SYS_FIELD_GET(reg, field, val) \
12161214
FIELD_GET(reg##_##field##_MASK, val)
12171215

@@ -1221,4 +1219,6 @@
12211219
#define SYS_FIELD_PREP_ENUM(reg, field, val) \
12221220
FIELD_PREP(reg##_##field##_MASK, reg##_##field##_##val)
12231221

1222+
#endif
1223+
12241224
#endif /* __ASM_SYSREG_H */

0 commit comments

Comments
 (0)