diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-12-09 10:00:24 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-12-09 10:00:24 +0000 |
| commit | 3a514592b698588326924625b6948a10c35fadd5 (patch) | |
| tree | 1209f5cb0a780f87c41e3299b22776a221766892 /arch/arm64/lib/mte.S | |
| parent | 17f84520cb8fcaf475c96c3ee90dd97b55a63669 (diff) | |
| parent | 0cc519f85a527e1c5ad5a7f182105fe614e9ff80 (diff) | |
Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/lib/mte.S')
| -rw-r--r-- | arch/arm64/lib/mte.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/lib/mte.S b/arch/arm64/lib/mte.S index 03ca6d8b8670..351537c12f36 100644 --- a/arch/arm64/lib/mte.S +++ b/arch/arm64/lib/mte.S @@ -4,7 +4,7 @@ */ #include <linux/linkage.h> -#include <asm/alternative.h> +#include <asm/asm-uaccess.h> #include <asm/assembler.h> #include <asm/mte.h> #include <asm/page.h> @@ -67,7 +67,7 @@ SYM_FUNC_START(mte_copy_tags_from_user) mov x3, x1 cbz x2, 2f 1: - uao_user_alternative 2f, ldrb, ldtrb, w4, x1, 0 + user_ldst 2f, ldtrb, w4, x1, 0 lsl x4, x4, #MTE_TAG_SHIFT stg x4, [x0], #MTE_GRANULE_SIZE add x1, x1, #1 @@ -94,7 +94,7 @@ SYM_FUNC_START(mte_copy_tags_to_user) 1: ldg x4, [x1] ubfx x4, x4, #MTE_TAG_SHIFT, #MTE_TAG_SIZE - uao_user_alternative 2f, strb, sttrb, w4, x0, 0 + user_ldst 2f, sttrb, w4, x0, 0 add x0, x0, #1 add x1, x1, #MTE_GRANULE_SIZE subs x2, x2, #1 |