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

[Stephen Rothwell]

Hi all,

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

In file included from include/linux/suspend.h:5,
                 from arch/x86/kernel/asm-offsets.c:14:
include/linux/swap.h:568:6: warning: no previous prototype for 'swap_free_nr' [-Wmissing-prototypes]
  568 | void swap_free_nr(swp_entry_t entry, int nr_pages)
      |      ^~~~~~~~~~~~
(lots of these)

Caused by commit

  ca23b4d4cae5 ("mm: swap: introduce swap_free_nr() for batched swap_free()")

from the mm-unstable branch of the mm tree.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 12 Apr 2024 16:25:26 +1000
Subject: [PATCH] fixup for "mm: swap: introduce swap_free_nr() for batched
 swap_free()"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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 b7a107e983b8..d1d35e92d7e9 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -565,7 +565,7 @@ static inline void swap_free(swp_entry_t swp)
 {
 }
 
-void swap_free_nr(swp_entry_t entry, int nr_pages)
+static inline void swap_free_nr(swp_entry_t entry, int nr_pages)
 {
 }
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpePQExfbtUI.pgp
Description: OpenPGP digital signature