]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: mm: Add additional parameter to uaccess_ttbr0_enable
authorChristoffer Dall <christoffer.dall@linaro.org>
Tue, 9 Jan 2018 10:51:58 +0000 (11:51 +0100)
committerChristoffer Dall <christoffer.dall@linaro.org>
Tue, 9 Jan 2018 20:08:52 +0000 (21:08 +0100)
commitb45bbd8fefd46a0a2c3a32755b587f4eb54701ed
treea65a6b2f137bcd2acb146249f4c464992a1528e1
parent12e598fec2ee6ecaa615b93fb248d8750ea09080
arm64: mm: Add additional parameter to uaccess_ttbr0_enable

Add an extra temporary register parameter to uaccess_ttbr0_enable 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
9e3909d7f0ebe8dfc9ed1e38210237911612f584
("arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN").

Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-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/mm/cache.S
arch/arm64/xen/hypercall.S