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 include/linux/hugetlb.h:828,
                 from fs/proc/task_mmu.c:4:
arch/arm64/include/asm/hugetlb.h:25:34: error: redefinition of 'arch_clear_hugetlb_flags'
   25 | #define arch_clear_hugetlb_flags arch_clear_hugetlb_flags
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~
include/linux/hugetlb.h:840:20: note: in expansion of macro 'arch_clear_hugetlb_flags'
  840 | static inline void arch_clear_hugetlb_flags(struct folio *folio) { }
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/include/asm/hugetlb.h:21:20: note: previous definition of 'arch_clear_hugetlb_flags' with type 'void(struct folio *)'
   21 | static inline void arch_clear_hugetlb_flags(struct folio *folio)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  34ffd5e56690 ("mm: convert arch_clear_hugepage_flags to take a folio")

from the mm-unstable branch of the mm tree.

I applied the following patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 28 Mar 2024 15:24:47 +1100
Subject: [PATCH] fix up for "mm: convert arch_clear_hugepage_flags to take a folio"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/hugetlb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index cc420c42a773..03fc6d625068 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -836,7 +836,7 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
 #define is_hugepage_only_range is_hugepage_only_range
 #endif
 
-#ifndef arch_clear_hugepage_flags
+#ifndef arch_clear_hugetlb_flags
 static inline void arch_clear_hugetlb_flags(struct folio *folio) { }
 #define arch_clear_hugetlb_flags arch_clear_hugetlb_flags
 #endif
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpSCRJrRRhR4.pgp
Description: OpenPGP digital signature