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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 12 Apr 2024 09:14:20 +1000

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_stat' [-Werror=implicit-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 (first 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 <[email-masked]>
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 <[email-masked]>
---
 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 = nr;
 		entry = folio->swap;
 		page = &folio->page;
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
 		count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPIN_REFAULT);
+#endif
 	}
 
 check_pte:
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell