Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec0fffd8 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: oom_kill: remove memcg argument from oom_kill_task() 



The memcg argument of oom_kill_task() hasn't been used since 341aea2b
'oom-kill: remove boost_dying_task_prio()'.  Kill it.

Signed-off-by: default avatarJohannes Weiner <jweiner@redhat.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0527b690

mm/oom_kill.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, 
}



#define K(x) ((x) << (PAGE_SHIFT-10))

static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)

static int oom_kill_task(struct task_struct *p)

{

	struct task_struct *q;

	struct mm_struct *mm;
@@ -533,7 +533,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, 
		}

	} while_each_thread(p, t);



	return oom_kill_task(victim, mem);

	return oom_kill_task(victim);

}



/*