diff options
author | Johannes Weiner <jweiner@redhat.com> | 2012-01-12 20:18:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 23:13:06 -0500 |
commit | ec0fffd84b162e0563a28a81aa049f946b31a8e2 (patch) | |
tree | 48e4c79076a917207c869b960ecd26da8fcb8505 /mm | |
parent | 0527b6903b2838e214c895d527806aefd61b3c8f (diff) |
mm: oom_kill: remove memcg argument from oom_kill_task()
The memcg argument of oom_kill_task() hasn't been used since 341aea2
'oom-kill: remove boost_dying_task_prio()'. Kill it.
Signed-off-by: Johannes Weiner <jweiner@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/oom_kill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 7c122faa05c5..05c0f27d4ed1 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -434,7 +434,7 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, | |||
434 | } | 434 | } |
435 | 435 | ||
436 | #define K(x) ((x) << (PAGE_SHIFT-10)) | 436 | #define K(x) ((x) << (PAGE_SHIFT-10)) |
437 | static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem) | 437 | static int oom_kill_task(struct task_struct *p) |
438 | { | 438 | { |
439 | struct task_struct *q; | 439 | struct task_struct *q; |
440 | struct mm_struct *mm; | 440 | struct mm_struct *mm; |
@@ -533,7 +533,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, | |||
533 | } | 533 | } |
534 | } while_each_thread(p, t); | 534 | } while_each_thread(p, t); |
535 | 535 | ||
536 | return oom_kill_task(victim, mem); | 536 | return oom_kill_task(victim); |
537 | } | 537 | } |
538 | 538 | ||
539 | /* | 539 | /* |