Skip to content

Commit 9c6489d

Browse files
committed
fixup! include,mm: fix dump_tasks declaration after memcg refactor
../mm/oom_kill.c:611:13: error: static declaration of 'dump_tasks' follows non-static declaration static void dump_tasks(struct oom_control *oc) ^ ../include/linux/oom.h:123:13: note: previous declaration is here extern void dump_tasks(struct mem_cgroup *memcg, ^ ../mm/oom_kill.c:655:16: error: too few arguments to function call, expected 2, have 1 dump_tasks(oc); ~~~~~~~~~~ ^ ../include/linux/oom.h:123:13: note: 'dump_tasks' declared here extern void dump_tasks(struct mem_cgroup *memcg, ^ 2 errors generated. Signed-off-by: fukiame <[email protected]>
1 parent d6bd26b commit 9c6489d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

include/linux/oom.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ extern void oom_killer_enable(void);
120120

121121
extern struct task_struct *find_lock_task_mm(struct task_struct *p);
122122

123-
extern void dump_tasks(struct mem_cgroup *memcg,
124-
const nodemask_t *nodemask);
123+
extern void dump_tasks(struct oom_control *oc);
125124

126125
#ifdef CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER
127126
extern bool should_ulmk_retry(gfp_t gfp);

mm/oom_kill.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ static int dump_task(struct task_struct *p, void *arg)
608608
* State information includes task's pid, uid, tgid, vm size, rss,
609609
* pgtables_bytes, swapents, oom_score_adj value, and name.
610610
*/
611-
static void dump_tasks(struct oom_control *oc)
611+
void dump_tasks(struct oom_control *oc)
612612
{
613613
pr_info("Tasks state (memory values in pages):\n");
614614
pr_info("[ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name\n");

0 commit comments

Comments
 (0)