UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Miaohe Lin 2023-06-10 11:46:15 +08:00 committed by Andrew Morton
parent e4d8675615
commit 833dfc0090
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/compaction.h
View File

@ -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

4
mm/compaction.c
View File

@ -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)
* 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;