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:   Wed, 11 May 2022 18:15:31 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     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: <20220511181531.7f27a5c1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/J+y7q7vuvY==dwLKkKUlYze";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/J+y7q7vuvY==dwLKkKUlYze
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

In file included from include/linux/hugetlb.h:757,
                 from arch/sparc/mm/hugetlbpage.c:11:
arch/sparc/include/asm/hugetlb.h: In function 'huge_ptep_clear_flush':
arch/sparc/include/asm/hugetlb.h:27:1: error: no return statement in functi=
on returning non-void [-Werror=3Dreturn-type]
   27 | }
      | ^

(and many more)

Caused by commit

  083af99303b9 ("mm: change huge_ptep_clear_flush() to return the original =
pte")

I applied the following hack to make it build.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 May 2022 18:10:56 +1000
Subject: [PATCH] fix up for "mm: change huge_ptep_clear_flush() to return t=
he original pte"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/include/asm/hugetlb.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/huge=
tlb.h
index b50aa6f8f9ab..0a26cca24232 100644
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
@@ -24,6 +24,7 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsig=
ned long addr,
 static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
 					  unsigned long addr, pte_t *ptep)
 {
+	return *ptep;
 }
=20
 #define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/J+y7q7vuvY==dwLKkKUlYze
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJ7cKMACgkQAVBC80lX
0Gym7wf/XNKVY2qjh09VsvjnYKVVrvGP58LiYynPpbjCuwAQrM/o4B/bQy+7jjxJ
daXgGe5PdGfGzdKhgshQmmm+x5JUyAMZmk7+/ldutnk0g77YJzZOHsRPMZVEAkgd
rqZxl2W+FOpV9wL9nlI4LZk0ek+bi1icyu1YIgXr+H+I5NmGCzGbCF4a6lJB6McO
/RycjMgPrNYp6XO6PDWq+IWEIbKX1yEkklveStv8FlTtoznRIDPx9cfTA4lKz/Nh
025VoADugEXKkLFO6P9Ubg3sOfPzqIDsoO5C+SML3vK67nsvgyk9WlulBpyRYbTr
CK/Vnh2H47WqAgeoIZSh3mMygtXYgQ==
=XfcZ
-----END PGP SIGNATURE-----

--Sig_/J+y7q7vuvY==dwLKkKUlYze--