mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

mm: vmscan: mark kswapd_run() and kswapd_stop() __meminit

Browse source 
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@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Yu Zhao <yuzhao@google.com>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Miaohe Lin 2023-06-06 20:18:13 +08:00 committed by Andrew Morton
parent e52ee4cc8f
commit e5797dc011
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/swap.h
View file

@ -460,8 +460,8 @@ static inline bool node_reclaim_enabled(void)
void check_move_unevictable_folios(struct folio_batch *fbatch); void check_move_unevictable_folios(struct folio_batch *fbatch);
void check_move_unevictable_pages(struct pagevec *pvec); void check_move_unevictable_pages(struct pagevec *pvec);
extern void kswapd_run(int nid); extern void __meminit kswapd_run(int nid);
extern void kswapd_stop(int nid); extern void __meminit kswapd_stop(int nid);
#ifdef CONFIG_SWAP #ifdef CONFIG_SWAP

4
mm/vmscan.c
View file

@ -7871,7 +7871,7 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim)
/* /*
* This kswapd start function will be called by init and node-hot-add. * 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); 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 * Called by memory hotplug when all memory in a node is offlined. Caller must
* be holding mem_hotplug_begin/done(). * be holding mem_hotplug_begin/done().
*/ */
void kswapd_stop(int nid) void __meminit kswapd_stop(int nid)
{ {
pg_data_t *pgdat = NODE_DATA(nid); pg_data_t *pgdat = NODE_DATA(nid);
struct task_struct *kswapd; struct task_struct *kswapd;