On Wed, Jan 17, 2018 at 12:38:50PM +0100, Christoffer Dall wrote: > 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@xxxxxxx> > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Marc Zyngier <marc.zyngier@xxxxxxx> > Signed-off-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx> Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>