diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2008-04-28 05:13:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:26 -0400 |
commit | 97d87c9710bc6c5f2585fb9dc58f5bedbe996f10 (patch) | |
tree | 60d6b2adc950c55330504fc472464339328d7ef7 | |
parent | 0c0a4a517a31e05efb38304668198a873bfec6ca (diff) |
oom_kill: remove unused parameter in badness()
In commit 4c4a22148909e4c003562ea7ffe0a06e26919e3c, we moved the
memcontroller-related code from badness() to select_bad_process(), so the
parameter 'mem' in badness() is unused now.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/oom_kill.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index e41504aa5da9..8a5467ee6265 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -53,8 +53,7 @@ static DEFINE_SPINLOCK(zone_scan_mutex); | |||
53 | * of least surprise ... (be careful when you change it) | 53 | * of least surprise ... (be careful when you change it) |
54 | */ | 54 | */ |
55 | 55 | ||
56 | unsigned long badness(struct task_struct *p, unsigned long uptime, | 56 | unsigned long badness(struct task_struct *p, unsigned long uptime) |
57 | struct mem_cgroup *mem) | ||
58 | { | 57 | { |
59 | unsigned long points, cpu_time, run_time, s; | 58 | unsigned long points, cpu_time, run_time, s; |
60 | struct mm_struct *mm; | 59 | struct mm_struct *mm; |
@@ -256,7 +255,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints, | |||
256 | if (p->oomkilladj == OOM_DISABLE) | 255 | if (p->oomkilladj == OOM_DISABLE) |
257 | continue; | 256 | continue; |
258 | 257 | ||
259 | points = badness(p, uptime.tv_sec, mem); | 258 | points = badness(p, uptime.tv_sec); |
260 | if (points > *ppoints || !chosen) { | 259 | if (points > *ppoints || !chosen) { |
261 | chosen = p; | 260 | chosen = p; |
262 | *ppoints = points; | 261 | *ppoints = points; |