Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 4 Jul 2023 12:23:42 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Linus Torvalds <torvalds@linux-foundation.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Suren Baghdasaryan <surenb@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the mm  tree
Message-ID: <20230704122342.4a1e2945@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/mKZ=U5fh_qVW6EVEdIbCAG=";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/mKZ=U5fh_qVW6EVEdIbCAG=
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the origin tree, today's linux-next build (arm64 defconfig)
failed like this:

arch/arm64/mm/fault.c: In function 'do_page_fault':
arch/arm64/mm/fault.c:624:9: error: 'vma' undeclared (first use in this fun=
ction); did you mean 'vmap'?
  624 |         vma =3D lock_mm_and_find_vma(mm, addr, regs);
      |         ^~~:
      |         vmap

Caused by commit

  ae870a68b5d1 ("arm64/mm: Convert to using lock_mm_and_find_vma()")

interacting with commit

  1e72a0774792 ("mm: disable CONFIG_PER_VMA_LOCK by default until its fixed=
")

from the mm tree.

I applied the following for today (but have no idea if it is correct).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Jul 2023 12:14:37 +1000
Subject: [PATCH] fix up for "arm64/mm: Convert to using lock_mm_and_find_vm=
a()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm64/mm/fault.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 9d78ff78b0e3..b8c80f7b8a5f 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -536,9 +536,7 @@ static int __kprobes do_page_fault(unsigned long far, u=
nsigned long esr,
 	unsigned long vm_flags;
 	unsigned int mm_flags =3D FAULT_FLAG_DEFAULT;
 	unsigned long addr =3D untagged_addr(far);
-#ifdef CONFIG_PER_VMA_LOCK
 	struct vm_area_struct *vma;
-#endif
=20
 	if (kprobe_page_fault(regs, esr))
 		return 0;
--=20
2.39.2

--=20
Cheers,
Stephen Rothwell

--Sig_/mKZ=U5fh_qVW6EVEdIbCAG=
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEyBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSjgq4ACgkQAVBC80lX
0Gw0qgf4usc2SIx+CPeeegNFMMTBj1qomTeCLecHbzx8lbmEgwrSnjDl+4U00W1k
WUeeaO2q6gqhHDKObNz26Ns/jFSgr3jD2vRWYmusiXgwxocqGsjvfuTKirLSqooj
boYgiR6tLg9WPSvP/PcHvppGKl/o4+TzaC0AC4Ggybjlgi/651ipxhSG+b1K7HZQ
brzaF60IRV5jCUpyE8TYVz2VDB2mRwYx7jw3ecSvlBVxnqxhbhSMG9ffsh8NCu5K
nzVjCgqY8vAIr0PBzvGHDhzq9RLB0I72bKvY9/LIlLMQhYi1sHFFdLTkPTJG5DSx
NgVKG3JQ+UTgnbqrjiCX4xOPgwUU
=t04A
-----END PGP SIGNATURE-----

--Sig_/mKZ=U5fh_qVW6EVEdIbCAG=--