Received-SPF: pass (google.com: domain of linux-kernel+bounces-122401-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 28 Mar 2024 15:34:14 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, 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: <20240328153414.326f6774@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_3P3CFaQ+hu8Lc2rdpxu7hf";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/_3P3CFaQ+hu8Lc2rdpxu7hf
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:

In file included from include/linux/hugetlb.h:828,
                 from fs/proc/task_mmu.c:4:
arch/arm64/include/asm/hugetlb.h:25:34: error: redefinition of 'arch_clear_=
hugetlb_flags'
   25 | #define arch_clear_hugetlb_flags arch_clear_hugetlb_flags
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~
include/linux/hugetlb.h:840:20: note: in expansion of macro 'arch_clear_hug=
etlb_flags'
  840 | static inline void arch_clear_hugetlb_flags(struct folio *folio) { }
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/include/asm/hugetlb.h:21:20: note: previous definition of 'arch_=
clear_hugetlb_flags' with type 'void(struct folio *)'
   21 | static inline void arch_clear_hugetlb_flags(struct folio *folio)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  34ffd5e56690 ("mm: convert arch_clear_hugepage_flags to take a folio")

from the mm-unstable branch of the mm tree.

I applied the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Mar 2024 15:24:47 +1100
Subject: [PATCH] fix up for "mm: convert arch_clear_hugepage_flags to take =
a folio"

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

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index cc420c42a773..03fc6d625068 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -836,7 +836,7 @@ static inline int is_hugepage_only_range(struct mm_stru=
ct *mm,
 #define is_hugepage_only_range is_hugepage_only_range
 #endif
=20
-#ifndef arch_clear_hugepage_flags
+#ifndef arch_clear_hugetlb_flags
 static inline void arch_clear_hugetlb_flags(struct folio *folio) { }
 #define arch_clear_hugetlb_flags arch_clear_hugetlb_flags
 #endif
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/_3P3CFaQ+hu8Lc2rdpxu7hf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYE80YACgkQAVBC80lX
0Gwr8Qf/Tw+h/Npou93MVXy2Tkj5AhW/qhAeMtX3rtJmbFqLr29eI2f8jIiFfIe7
KZ853lQ/ar6qO3nGFzd+jISznk+QHoc1JC7ZvOxktBmoiu6Zcq8xRAyPtiA/M8xk
Jb2FUB2muBRLysO8Lp0/ZQDMy3x6H78147uinLk/nI4zwz/H/W6WPjRd/t/q+39f
eo4p9tk/MPH5lz/sQM+n7o2NaHde8xHnQhe9FyIs+tUCGD8Vyi4RMAbed8/0kRWB
Xt89cIoY0YckYPUK0ukUPFbaE2JG/wtmPTejeerPq5LIaMyNgK2YA7qbHXNtWuNV
rBq0hCBWfG1wQfbypViumQlUrl/d4w==
=F8T9
-----END PGP SIGNATURE-----

--Sig_/_3P3CFaQ+hu8Lc2rdpxu7hf--