Received-SPF: pass (google.com: domain of linux-kernel+bounces-132353-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, 5 Apr 2024 13:55:27 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: 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: <20240405135527.4b5daaed@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/NoImhhi7JSTuJe.EShoZ1LH";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/NoImhhi7JSTuJe.EShoZ1LH
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 arch/arm64/include/asm/memory.h:213,
                 from arch/arm64/include/asm/page.h:46,
                 from include/linux/page_counter.h:8,
                 from mm/memcontrol.c:28:
mm/memcontrol.c: In function '__mod_memcg_lruvec_state':
include/linux/mmdebug.h:114:35: error: expected expression before 'do'
  114 | #define VM_WARN_ON_IRQS_ENABLED() do { } while (0)
      |                                   ^~
mm/memcontrol.c:867:29: note: in expansion of macro 'VM_WARN_ON_IRQS_ENABLE=
D'
  867 |                         if (VM_WARN_ON_IRQS_ENABLED())
      |                             ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  e04f729678f6 ("__mod_memcg_lruvec_state(): enhance diagnostics")

from the mm-unstable branch of the mm tree.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Apr 2024 13:27:48 +1100
Subject: [PATCH] fix up for "__mod_memcg_lruvec_state(): enhance diagnostic=
s"

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

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 42f82259864f..91ac261877ec 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -864,8 +864,12 @@ void __mod_memcg_lruvec_state(struct lruvec *lruvec, e=
num node_stat_item idx,
 				pr_warn("stat item index: %d\n", idx);
 			break;
 		default:
+#ifdef CONFIG_DEBUG_VM_IRQSOFF
 			if (VM_WARN_ON_IRQS_ENABLED())
 				pr_warn("stat item index: %d\n", idx);
+#else
+			;
+#endif
 		}
 	}
=20
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/NoImhhi7JSTuJe.EShoZ1LH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYPaB8ACgkQAVBC80lX
0GzAaAgAmy7FHNP6Q8kLxHwSI+wEgEuToR/mzlYCiccBO5w75v+vzRs+Y2s748fp
/hmEgbZe6im+ud5ZMgK00XmvE8kkcyVX0HBSHzLVwvB40RRgsDtbfkZXIVcEWTx5
fsiF2cuEC6ELAfL+NZ08C+fwH3arXx8gslIUznOPdJy9Zbe0bb7bHxDR7yaudTxn
c3OWth/ZPLAZ0up6i+lHe/DdKoEKdgL+uf4FQvgL4qjwYRmWE5WZOZ4vlfdnkvkI
oTcKlz2FwbbWQYX6Ib2Sgm3VZw4ptkthsgY/AcBOrz2UkDLorkSZE4osspaj6jly
1k9thZ7v8iFNqbWagZYXEjy2T0HjKA==
=UroZ
-----END PGP SIGNATURE-----

--Sig_/NoImhhi7JSTuJe.EShoZ1LH--