The patch titled
Subject: mm: vmscan: mark kswapd_run() and kswapd_stop() __meminit
has been added to the -mm mm-unstable branch. Its filename is
mm-vmscan-mark-kswapd_run-and-kswapd_stop-__meminit.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-vmscan-mark-kswapd_run-and-kswapd_stop-__meminit.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Subject: mm: vmscan: mark kswapd_run() and kswapd_stop() __meminit
Date: Tue, 6 Jun 2023 20:18:13 +0800
Add __meminit to kswapd_run() and kswapd_stop() to ensure they're default
to __init when memory hotplug is not enabled.
Link: https://lkml.kernel.org/r/20230606121813.242163-1-linmiaohe@xxxxxxxxxx
Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/swap.h | 4 ++--
mm/vmscan.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/include/linux/swap.h~mm-vmscan-mark-kswapd_run-and-kswapd_stop-__meminit
+++ a/include/linux/swap.h
@@ -460,8 +460,8 @@ static inline bool node_reclaim_enabled(
void check_move_unevictable_folios(struct folio_batch *fbatch);
void check_move_unevictable_pages(struct pagevec *pvec);
-extern void kswapd_run(int nid);
-extern void kswapd_stop(int nid);
+extern void __meminit kswapd_run(int nid);
+extern void __meminit kswapd_stop(int nid);
#ifdef CONFIG_SWAP
--- a/mm/vmscan.c~mm-vmscan-mark-kswapd_run-and-kswapd_stop-__meminit
+++ a/mm/vmscan.c
@@ -7871,7 +7871,7 @@ unsigned long shrink_all_memory(unsigned
/*
* This kswapd start function will be called by init and node-hot-add.
*/
-void kswapd_run(int nid)
+void __meminit kswapd_run(int nid)
{
pg_data_t *pgdat = NODE_DATA(nid);
@@ -7892,7 +7892,7 @@ void kswapd_run(int nid)
* Called by memory hotplug when all memory in a node is offlined. Caller must
* be holding mem_hotplug_begin/done().
*/
-void kswapd_stop(int nid)
+void __meminit kswapd_stop(int nid)
{
pg_data_t *pgdat = NODE_DATA(nid);
struct task_struct *kswapd;
_
Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are
mm-remove-obsolete-alloc_migrate_target.patch
mm-page_alloc-remove-unneeded-header-files.patch
memcg-use-helper-macro-flush_time.patch
mm-vmscan-mark-kswapd_run-and-kswapd_stop-__meminit.patch
