arm64: mm: Add additional parameter to uaccess_ttbr0_disable
authorChristoffer Dall <christoffer.dall@linaro.org>
Wed, 17 Jan 2018 11:35:27 +0000 (12:35 +0100)
committerChristoffer Dall <christoffer.dall@linaro.org>
Wed, 17 Jan 2018 12:57:49 +0000 (13:57 +0100)
commit0482b50546b12e82346903500af081ed329f915c
tree7a2bb3009bdf9117b3ed5b84b96f5cc7a3fc57de
parent448fadc8a4a36cad560e07b4fbc94cba49526956
arm64: mm: Add additional parameter to uaccess_ttbr0_disable

Add an extra temporary register parameter to uaccess_ttbr0_disable which
is about to be required for arm64 PAN support.

This patch doesn't introduce any functional change but ensures that the
kernel compiles once the KVM/ARM tree is merged with the arm64 tree by
ensuring a trivially mergable conflict with commit
6b88a32c7af68895134872cdec3b6bfdb532d94e
("arm64: kpti: Fix the interaction between ASID switching and software PAN").

Cc: Will Deacon <will.deacon@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
arch/arm64/include/asm/asm-uaccess.h
arch/arm64/lib/clear_user.S
arch/arm64/lib/copy_from_user.S
arch/arm64/lib/copy_in_user.S
arch/arm64/lib/copy_to_user.S
arch/arm64/mm/cache.S
arch/arm64/xen/hypercall.S