From 42b231ad8e06d944abc597087e3ed8a888fd8b45 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Thu, 12 Jan 2012 17:18:29 -0800 Subject: [PATCH] --- yaml --- r: 284375 b: refs/heads/master c: ec0fffd84b162e0563a28a81aa049f946b31a8e2 h: refs/heads/master i: 284373: 8d1ab42b2f12e2023643d4b8bdbc386b9e4a9826 284371: cea258e62239d00c6669d41c3d65a3b0b5aba2b2 284367: 4e823b020f25350c2a1195199e69cb0fe512fb33 v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e811dfc8327..fccaf5fffbe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0527b6903b2838e214c895d527806aefd61b3c8f +refs/heads/master: ec0fffd84b162e0563a28a81aa049f946b31a8e2 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 7c122faa05c5..05c0f27d4ed1 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -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); } /*