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:   Thu, 12 May 2022 19:38:55 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
Cc:     Anshuman Khandual <anshuman.khandual@arm.com>,
        Baolin Wang <baolin.wang@linux.alibaba.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: <20220512193855.4f6ce32f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Vt0kgeqzVmM8HOsbxNhvVRO";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

arch/arm64/mm/hugetlbpage.c: In function 'huge_ptep_clear_flush':
arch/arm64/mm/hugetlbpage.c:493:16: error: implicit declaration of function=
 'get_clear_flush'; did you mean 'ptep_clear_flush'? [-Werror=3Dimplicit-fu=
nction-declaration]
  493 |         return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncon=
tig);
      |                ^~~~~~~~~~~~~~~
      |                ptep_clear_flush
arch/arm64/mm/hugetlbpage.c:493:16: error: incompatible types when returnin=
g type 'int' but 'pte_t' was expected
  493 |         return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncon=
tig);
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~
arch/arm64/mm/hugetlbpage.c:494:1: error: control reaches end of non-void f=
unction [-Werror=3Dreturn-type]
  494 | }
      | ^

Caused by commit

  00df1f1a133b ("mm: change huge_ptep_clear_flush() to return the original =
pte")

interacting with commit

  fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()")

I have applied the following merg fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 May 2022 19:33:11 +1000
Subject: [PATCH] fixup for "mm: change huge_ptep_clear_flush() to return th=
e original pte"

It interacts with commit

  fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()")

from the arm64 tree

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

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 5bdf913dedc7..30f5b76aabe9 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -490,7 +490,7 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
 		return ptep_clear_flush(vma, addr, ptep);
=20
 	ncontig =3D find_num_contig(vma->vm_mm, addr, ptep, &pgsize);
-	return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
+	return get_clear_contig(vma->vm_mm, addr, ptep, pgsize, ncontig);
 }
=20
 static int __init hugetlbpage_init(void)
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/Vt0kgeqzVmM8HOsbxNhvVRO
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJ81a8ACgkQAVBC80lX
0GzjMgf6AgRFefDeS1S3ZP0ouMb1S09btO6BDvfDpRwFbNPLiGTq9kR/LU7qF4Ej
k8okIJtlRwvaabwhkLCXrOVkf+M4Dzpv5ZS3Tmm/0UW0i/lvMqVKMn/rM7f7ZfZ1
2qQEVcNGSISXguePdeT78yzMrMLv1xLXYkSohmOQuac3ojUBbTPkHo984ubR4b07
du8Wirfd109Uz3ln1Vhukp+iMZZLqkNk2P9ZI+Z99CfdCTf4fFLIFdN/j446Afbz
a8o9yxd9ZFwYMNctGtN7ErHXwyaFNstTghSsUrk/phj76dSHjISoCH3SLsQ/6OG/
DL7Oj/BKyzZ2YzQlEoL5jvL8KO4+/g==
=C1S5
-----END PGP SIGNATURE-----

--Sig_/Vt0kgeqzVmM8HOsbxNhvVRO--