Received-SPF: pass (google.com: domain of linux-kernel+bounces-56007-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 7 Feb 2024 17:17:41 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kairui Song <kasong@tencent.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: <20240207171741.1f3f090f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SdI4lH_kzqvTR_gswJ2k=GE";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

mm/memory.c: In function 'do_swap_page':
mm/memory.c:4004:29: error: implicit declaration of function 'swapcache_pre=
pare'; did you mean 'swapcache_clear'? [-Werror=3Dimplicit-function-declara=
tion]
 4004 |                         if (swapcache_prepare(entry))
      |                             ^~~~~~~~~~~~~~~~~
      |                             swapcache_clear

Caused by commit

  1fa5b77af107 ("mm/swap: fix race condition in direct swapin path")

from the mm-unstable branch of the mm tree.

# CONFIG_SWAP is not set

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Feb 2024 17:04:15 +1100
Subject: [PATCH] fix up for "mm/swap: fix race condition in direct swapin
 path"

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

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 768a9078070d..b4c389b9e4e0 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -552,6 +552,11 @@ static inline int swap_duplicate(swp_entry_t swp)
 	return 0;
 }
=20
+static inline int swapcache_prepare(swp_entry_t swp)
+{
+	return 0;
+}
+
 static inline void swap_free(swp_entry_t swp)
 {
 }
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/SdI4lH_kzqvTR_gswJ2k=GE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXDIIUACgkQAVBC80lX
0GyjPAf+NVv5nt0BdXm7Yr8nTfKcUV9Sldle4+ccAHH50Ly8lXY4dZ0srhTIKU7K
yZsXL8YysjPi/U+fDaKXG9G9xU7G9SY4lHgfAoaaG6I+4xOMkgBvPWhd2HmDO7dj
QelE+UfxTMiGWKEf86V9biEapfVE5FnErzkFcBEmlttokM1j0IytYn8LkIa+4iGM
Th5W653WctvWxGo/pfo9698HWcsgMMVB+dnDqDtut6elk/7KJsGa8cCSdIeoW89F
aT8A0Grh49Sfu/yTh1CK348OAqBdbfemHGF7XJOWNnqgxJmoX4ZcZ6wZGlfhn73m
UnUKG6dHOvYfa/8RZBfY+TuFeMD9XA==
=chF1
-----END PGP SIGNATURE-----

--Sig_/SdI4lH_kzqvTR_gswJ2k=GE--