linux-next: build failure after merge of the mm tree

[Stephen Rothwell]

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_ENABLED'
  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@xxxxxxxxxxxxxxxx>
Date: Fri, 5 Apr 2024 13:27:48 +1100
Subject: [PATCH] fix up for "__mod_memcg_lruvec_state(): enhance diagnostics"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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, enum 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
 		}
 	}
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgp9Zm8bIxeDl.pgp
Description: OpenPGP digital signature