Re: linux-next: build failure after merge of the kvm-arm tree

[Will Deacon]

On Tue, Sep 23, 2025 at 05:02:02PM +0100, Will Deacon wrote:
> On Tue, Sep 23, 2025 at 05:28:05PM +0200, Mark Brown wrote:
> > After merging the kvm-arm tree, today's linux-next build (arm64
> > defconfig) failed like this:
> > 
> > In file included from <command-line>:
> > /tmp/next/build/arch/arm64/kvm/at.c: In function 'setup_s1_walk':
> > /tmp/next/build/arch/arm64/kvm/at.c:229:30: error: 'TCR_SH1_MASK' undeclared (first use in this function); did you mean 'TCR_SH0_MASK'?
> >   229 |                    FIELD_GET(TCR_SH1_MASK, tcr) :
> >       |                              ^~~~~~~~~~~~
> 
> [...]
> 
> > Caused by commit
> > 
> >    4f91624778b27 ("arm64/sysreg: Replace TCR_EL1 field macros")
> > 
> > from the arm64 tree.  I have reverted that commit.
> 
> Thanks, I'll drop it from arm64 as well.

(now dropped)

Will