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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 26 Feb 2025 16:12:17 +1100

Hi all,

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

In file included from include/linux/suspend.h:5,
                 from arch/powerpc/mm/mem.c:17:
include/linux/swap.h:581:12: error: 'folio_alloc_swap' defined but not used [-Werror=unused-function]
  581 | static int folio_alloc_swap(struct folio *folio, gfp_t gfp_mask)
      |            ^~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

(and many, many more - some just warnings)

Caused by commit

  436a263c3c8e ("mm, swap: simplify folio swap allocation")

from the mm-unstable branch of the mm tree.

I have applied the following patch for today.

From: Stephen Rothwell <[email-masked]>
Date: Wed, 26 Feb 2025 15:54:33 +1100
Subject: [PATCH] fix up for "mm, swap: simplify folio swap allocation"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 include/linux/swap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 6547fc4b9523..eb0ffcbe93e8 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -578,7 +578,7 @@ static inline int swp_swapcount(swp_entry_t entry)
 	return 0;
 }
 
-static int folio_alloc_swap(struct folio *folio, gfp_t gfp_mask)
+static inline int folio_alloc_swap(struct folio *folio, gfp_t gfp_mask)
 {
 	return -EINVAL;
 }
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell