Received-SPF: pass (google.com: domain of linux-kernel+bounces-141709-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 12 Apr 2024 09:14:20 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Barry Song <v-songbaohua@oppo.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: <20240412091420.3d7c39ee@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/j+xycq552cwx/eM8GNWel+a";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/j+xycq552cwx/eM8GNWel+a
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

mm/memory.c: In function 'do_swap_page':
mm/memory.c:4169:17: error: implicit declaration of function 'count_mthp_st=
at' [-Werror=3Dimplicit-function-declaration]
 4169 |                 count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_=
SWPIN_REFAULT);
      |                 ^~~~~~~~~~~~~~~
mm/memory.c:4169:53: error: 'MTHP_STAT_ANON_SWPIN_REFAULT' undeclared (firs=
t use in this function)
 4169 |                 count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_=
SWPIN_REFAULT);
      |                                                     ^~~~~~~~~~~~~~~=
~~~~~~~~~~~~~
mm/memory.c:4169:53: note: each undeclared identifier is reported only once=
 for each function it appears in
cc1: some warnings being treated as errors

Caused by commits

  d46de7357458 ("mm: add per-order mTHP anon_alloc and anon_alloc_fallback =
counters")
  37a4ecbf36cb ("mm: add per-order mTHP swpin_refault counter")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Apr 2024 09:11:42 +1000
Subject: [PATCH] fix up for ""mm: add per-order mTHP anon_alloc and
 anon_alloc_fallback counters"

and "mm: add per-order mTHP swpin_refault counter"

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

diff --git a/mm/memory.c b/mm/memory.c
index b6fa5146b260..b3c33a76bcfa 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4166,7 +4166,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
 		nr_pages =3D nr;
 		entry =3D folio->swap;
 		page =3D &folio->page;
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
 		count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPIN_REFAULT);
+#endif
 	}
=20
 check_pte:
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/j+xycq552cwx/eM8GNWel+a
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYYbswACgkQAVBC80lX
0GxhKwf/VBJlmoGu6BUKeV2TRToe7I72vIK+VCLydL5u1qQx5rW0WHy0iq5GMlWe
a4pPQqed1aDfMmsrd6j0kCFmNDGRxgwMoy8/Br2m2ZR8ncKEVqXR7sqKoykjShlU
/klWRzWoDhnw4Bw6Z9ZBcltridjOUKLObHKUnvjabvAh6xXeelI3/LPkvx7+Gkvo
Noa7/JPvN4bpMzUI6yFZrceUT4X6UWz6pQ8QFNWyV+wRgTcyDSDs/R4a9yDwdVYo
MMWI5TlRkRBtUBIq6fw6xK59O9UyabdMtjrEH/FVojmU0OKjwGDKOSAnAPiBrdF6
grV2PcxXvm+gOA6gNrLZ3k/4c0h0ig==
=Vcqg
-----END PGP SIGNATURE-----

--Sig_/j+xycq552cwx/eM8GNWel+a--