From b9299396d5aa1c95fadbe53b0d40d52d08d434da Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Mon, 28 Apr 2008 02:13:35 -0700
Subject: [PATCH] --- yaml --- r: 94053 b: refs/heads/master c:
 97d87c9710bc6c5f2585fb9dc58f5bedbe996f10 h: refs/heads/master i:   94051:
 24984ec8cc4c6590f21cc6f6d2db158c5b547b9e v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cd1bbdb4ee4a..f96ca8f986c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c0a4a517a31e05efb38304668198a873bfec6ca
+refs/heads/master: 97d87c9710bc6c5f2585fb9dc58f5bedbe996f10
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index e41504aa5da9..8a5467ee6265 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -53,8 +53,7 @@ static DEFINE_SPINLOCK(zone_scan_mutex);
  *    of least surprise ... (be careful when you change it)
  */
 
-unsigned long badness(struct task_struct *p, unsigned long uptime,
-			struct mem_cgroup *mem)
+unsigned long badness(struct task_struct *p, unsigned long uptime)
 {
 	unsigned long points, cpu_time, run_time, s;
 	struct mm_struct *mm;
@@ -256,7 +255,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 		if (p->oomkilladj == OOM_DISABLE)
 			continue;
 
-		points = badness(p, uptime.tv_sec, mem);
+		points = badness(p, uptime.tv_sec);
 		if (points > *ppoints || !chosen) {
 			chosen = p;
 			*ppoints = points;