summaryrefslogtreecommitdiffstats
path: root/arch/arm64/lib
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2022-12-01 18:31:12 +0100
committerWill Deacon <will@kernel.org>2022-12-01 18:31:12 +0100
commitacb3f4bc2108dca531f81233383e21f0bdc02267 (patch)
treeb4ded596372527fdcacc1e89211b691c1e85143f /arch/arm64/lib
parentarm64/sysreg: Convert ID_DFR1_EL1 to automatic generation (diff)
downloadlinux-acb3f4bc2108dca531f81233383e21f0bdc02267.tar.xz
linux-acb3f4bc2108dca531f81233383e21f0bdc02267.zip
arm64/sysreg: Remove duplicate definitions from asm/sysreg.h
With the new-fangled generation of asm/sysreg-defs.h, some definitions have ended up being duplicated between the two files. Remove these duplicate definitions, and consolidate the naming for GMID_EL1_BS_WIDTH. Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/lib')
-rw-r--r--arch/arm64/lib/mte.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/lib/mte.S b/arch/arm64/lib/mte.S
index 1b7c93ae7e63..5018ac03b6bf 100644
--- a/arch/arm64/lib/mte.S
+++ b/arch/arm64/lib/mte.S
@@ -18,7 +18,7 @@
*/
.macro multitag_transfer_size, reg, tmp
mrs_s \reg, SYS_GMID_EL1
- ubfx \reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_SIZE
+ ubfx \reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_WIDTH
mov \tmp, #4
lsl \reg, \tmp, \reg
.endm