diff options
| author |  Mark Brown <broonie@kernel.org>
| 2022-07-04 18:02:50 +0100 |
|---|---|---|
| committer |  Will Deacon <will@kernel.org>
| 2022-07-05 11:45:46 +0100 |
| commit | b2d71f275d544719598ed754069f2bb421e4af17 (patch) | |
| tree | 5cfab261cd535a8a292ea8f9a0a044e9360e6a21 /arch/arm64/include/asm/asm_pointer_auth.h | |
| parent | arm64/sysreg: Add _EL1 into ID_AA64ISAR1_EL1 definition names (diff) | |
| download | linux-b2d71f275d544719598ed754069f2bb421e4af17.tar.gz linux-b2d71f275d544719598ed754069f2bb421e4af17.tar.bz2 linux-b2d71f275d544719598ed754069f2bb421e4af17.zip | |
arm64/sysreg: Add _EL1 into ID_AA64ISAR2_EL1 definition names
Normally we include the full register name in the defines for fields within
registers but this has not been followed for ID registers. In preparation
for automatic generation of defines add the _EL1s into the defines for
ID_AA64ISAR2_EL1 to follow the convention. No functional changes.
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220704170302.2609529-17-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/asm_pointer_auth.h')
| -rw-r--r-- | arch/arm64/include/asm/asm_pointer_auth.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/asm_pointer_auth.h b/arch/arm64/include/asm/asm_pointer_auth.h index 3b192e04a5dd..13ecc79854ee 100644 --- a/arch/arm64/include/asm/asm_pointer_auth.h +++ b/arch/arm64/include/asm/asm_pointer_auth.h @@ -61,7 +61,7 @@ alternative_else_nop_endif mrs \tmp1, id_aa64isar1_el1 ubfx \tmp1, \tmp1, #ID_AA64ISAR1_EL1_APA_SHIFT, #8 mrs_s \tmp2, SYS_ID_AA64ISAR2_EL1 - ubfx \tmp2, \tmp2, #ID_AA64ISAR2_APA3_SHIFT, #4 + ubfx \tmp2, \tmp2, #ID_AA64ISAR2_EL1_APA3_SHIFT, #4 orr \tmp1, \tmp1, \tmp2 cbz \tmp1, .Lno_addr_auth\@ mov_q \tmp1, (SCTLR_ELx_ENIA | SCTLR_ELx_ENIB | \ |