Re: linux-next: manual merge of the arm64 tree with the kvm-arm tree

[Catalin Marinas]

On Fri, Mar 27, 2026 at 06:44:58PM +0000, Mark Brown wrote:
> diff --cc arch/arm64/kvm/at.c
> index a024d9a770dc74,1adf88a5732840..00000000000000
> --- a/arch/arm64/kvm/at.c
> +++ b/arch/arm64/kvm/at.c
> @@@ -1753,8 -1785,10 +1783,10 @@@ int __kvm_at_swap_desc(struct kvm *kvm
>   	if (!writable)
>   		return -EPERM;
>   
>  -	ptep = (u64 __user *)hva + offset;
>  +	ptep = (void __user *)hva + offset;
> - 	if (cpus_have_final_cap(ARM64_HAS_LSE_ATOMICS))
> + 	if (cpus_have_final_cap(ARM64_HAS_LSUI))
> + 		r = __lsui_swap_desc(ptep, old, new);
> + 	else if (cpus_have_final_cap(ARM64_HAS_LSE_ATOMICS))
>   		r = __lse_swap_desc(ptep, old, new);
>   	else
>   		r = __llsc_swap_desc(ptep, old, new);

It looks fine. Thanks Mark.

-- 
Catalin