On 09/01/18 13:43, Christoffer Dall wrote: > 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. > > 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> Maybe worth adding that this matches 27a921e75711d924617269e0ba4adb8bae9fd0d1 ("arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN")? Otherwise: Reviewed-by: Marc Zyngier <marc.zyngier@xxxxxxx> Thanks for taking care of this. M. -- Jazz is not dead. It just smells funny...