diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
| commit | 65133033ee6ee34724ea3d82d5d1cfc6839ffdae (patch) | |
| tree | 2fca9fd5630bbfd503a75e3cc69f30056a629c92 /arch/arm64/include/asm/asm-uaccess.h | |
| parent | Merge tag 'perf-core-for-mingo-5.5-20191021' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | perf/headers: Fix spelling s/EACCESS/EACCES/, s/privilidge/privilege/ (diff) | |
| download | linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.tar.xz linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/asm-uaccess.h')
| -rw-r--r-- | arch/arm64/include/asm/asm-uaccess.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h index f74909ba29bd..5bf963830b17 100644 --- a/arch/arm64/include/asm/asm-uaccess.h +++ b/arch/arm64/include/asm/asm-uaccess.h @@ -78,10 +78,9 @@ alternative_else_nop_endif /* * Remove the address tag from a virtual address, if present. */ - .macro clear_address_tag, dst, addr - tst \addr, #(1 << 55) - bic \dst, \addr, #(0xff << 56) - csel \dst, \dst, \addr, eq + .macro untagged_addr, dst, addr + sbfx \dst, \addr, #0, #56 + and \dst, \dst, \addr .endm #endif |