From: Catalin Marinas <catalin.marinas@arm.com>
To: Mark Brown <broonie@kernel.org>
Cc: Will Deacon <will@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Marc Zyngier <maz@kernel.org>, Yeoreum Yun <yeoreum.yun@arm.com>,
Zenghui Yu <zenghui.yu@linux.dev>
Subject: Re: linux-next: manual merge of the arm64 tree with the kvm-arm tree
Date: Wed, 1 Apr 2026 12:01:00 +0100 [thread overview]
Message-ID: <acz67AZyiMZHyPKr@arm.com> (raw)
In-Reply-To: <acbQKqGV50jNaDBU@sirena.co.uk>
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
prev parent reply other threads:[~2026-04-01 11:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-27 18:44 linux-next: manual merge of the arm64 tree with the kvm-arm tree Mark Brown
2026-04-01 11:01 ` Catalin Marinas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=acz67AZyiMZHyPKr@arm.com \
--to=catalin.marinas@arm.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
--cc=yeoreum.yun@arm.com \
--cc=zenghui.yu@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox