Commit a99ef9cb authored by Alexandru Elisei's avatar Alexandru Elisei Committed by Catalin Marinas
Browse files

arm64: Make ESR_ELx_xVC_IMM_MASK compatible with assembly 



ESR_ELx_xVC_IMM_MASK is used as a mask for the immediate value for the
HVC/SMC instructions. The header file is included by assembly files (like
entry.S) and ESR_ELx_xVC_IMM_MASK is not conditioned on __ASSEMBLY__ being
undefined. Use the UL() macro for defining the constant's size, as that is
compatible with both C code and assembly, whereas the UL suffix only works
for C code.

Signed-off-by: default avatarAlexandru Elisei <alexandru.elisei@arm.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220425114444.368693-2-alexandru.elisei@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b2d229d4

arch/arm64/include/asm/esr.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 
#define ESR_ELx_WFx_ISS_TI	(UL(1) << 0)

#define ESR_ELx_WFx_ISS_WFI	(UL(0) << 0)

#define ESR_ELx_WFx_ISS_WFE	(UL(1) << 0)

#define ESR_ELx_xVC_IMM_MASK	((1UL << 16) - 1)

#define ESR_ELx_xVC_IMM_MASK	((UL(1) << 16) - 1)



#define DISR_EL1_IDS		(UL(1) << 24)

/*