X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Foom_kill.c;h=8a5467ee6265deb11a48fe9861348dd182dc9f7f;hb=f0af566da6e9a4a2f5a83c5a70f3d0a772050e21;hp=e41504aa5da9efa8d5155e37097f425bdf0b193c;hpb=dd1a239f6f2d4d3eedd318583ec319aa145b324c;p=linux-2.6 diff --git a/mm/oom_kill.c b/mm/oom_kill.c index e41504aa5d..8a5467ee62 100644 --- a/mm/oom_kill.c +++ b/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;