Commit 833dfc00 authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton

mm: compaction: mark kcompactd_run() and kcompactd_stop() __meminit

Add __meminit to kcompactd_run() and kcompactd_stop() to ensure they're
default to __init when memory hotplug is not enabled.

Link: https://lkml.kernel.org/r/20230610034615.997813-1-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e4d86756
...@@ -98,8 +98,8 @@ extern void compaction_defer_reset(struct zone *zone, int order, ...@@ -98,8 +98,8 @@ extern void compaction_defer_reset(struct zone *zone, int order,
bool compaction_zonelist_suitable(struct alloc_context *ac, int order, bool compaction_zonelist_suitable(struct alloc_context *ac, int order,
int alloc_flags); int alloc_flags);
extern void kcompactd_run(int nid); extern void __meminit kcompactd_run(int nid);
extern void kcompactd_stop(int nid); extern void __meminit kcompactd_stop(int nid);
extern void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx); extern void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx);
#else #else
......
...@@ -3050,7 +3050,7 @@ static int kcompactd(void *p) ...@@ -3050,7 +3050,7 @@ static int kcompactd(void *p)
* This kcompactd start function will be called by init and node-hot-add. * This kcompactd start function will be called by init and node-hot-add.
* On node-hot-add, kcompactd will moved to proper cpus if cpus are hot-added. * On node-hot-add, kcompactd will moved to proper cpus if cpus are hot-added.
*/ */
void kcompactd_run(int nid) void __meminit kcompactd_run(int nid)
{ {
pg_data_t *pgdat = NODE_DATA(nid); pg_data_t *pgdat = NODE_DATA(nid);
...@@ -3068,7 +3068,7 @@ void kcompactd_run(int nid) ...@@ -3068,7 +3068,7 @@ void kcompactd_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 kcompactd_stop(int nid) void __meminit kcompactd_stop(int nid)
{ {
struct task_struct *kcompactd = NODE_DATA(nid)->kcompactd; struct task_struct *kcompactd = NODE_DATA(nid)->kcompactd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment