diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2020-12-09 21:04:48 +0300 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2020-12-09 21:04:48 +0300 |
commit | ba4259a6f87a4d7b5039673569db06b6d8b74cf3 (patch) | |
tree | ca880ae0a2f555ee49b572c97703ad6a9da9fcff /arch/arm64/include/asm/uaccess.h | |
parent | e0f7a8d5e87f31da15a80fcf038f6296bae26f38 (diff) | |
parent | 344f2db2a18af45faafce13133c84c4f076876a6 (diff) | |
download | linux-ba4259a6f87a4d7b5039673569db06b6d8b74cf3.tar.xz |
Merge branch 'for-next/misc' into for-next/core
* for-next/misc:
: Miscellaneous patches
arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
kasan: arm64: set TCR_EL1.TBID1 when enabled
arm64: mte: optimize asynchronous tag check fault flag check
arm64/mm: add fallback option to allocate virtually contiguous memory
arm64/smp: Drop the macro S(x,s)
arm64: consistently use reserved_pg_dir
arm64: kprobes: Remove redundant kprobe_step_ctx
# Conflicts:
# arch/arm64/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/arm64/include/asm/uaccess.h')
-rw-r--r-- | arch/arm64/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 769cad7b4910..abb31aa1f8ca 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -86,8 +86,8 @@ static inline void __uaccess_ttbr0_disable(void) local_irq_save(flags); ttbr = read_sysreg(ttbr1_el1); ttbr &= ~TTBR_ASID_MASK; - /* reserved_ttbr0 placed before swapper_pg_dir */ - write_sysreg(ttbr - RESERVED_TTBR0_SIZE, ttbr0_el1); + /* reserved_pg_dir placed before swapper_pg_dir */ + write_sysreg(ttbr - PAGE_SIZE, ttbr0_el1); isb(); /* Set reserved ASID */ write_sysreg(ttbr, ttbr1_el1); |