浏览代码

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>
Li Zefan 17 年之前
父节点
当前提交
97d87c9710
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      mm/oom_kill.c

+ 2 - 3
mm/oom_kill.c

@@ -53,8 +53,7 @@ static DEFINE_SPINLOCK(zone_scan_mutex);
  *    of least surprise ... (be careful when you change it)
  *    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;
 	unsigned long points, cpu_time, run_time, s;
 	struct mm_struct *mm;
 	struct mm_struct *mm;
@@ -256,7 +255,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 		if (p->oomkilladj == OOM_DISABLE)
 		if (p->oomkilladj == OOM_DISABLE)
 			continue;
 			continue;
 
 
-		points = badness(p, uptime.tv_sec, mem);
+		points = badness(p, uptime.tv_sec);
 		if (points > *ppoints || !chosen) {
 		if (points > *ppoints || !chosen) {
 			chosen = p;
 			chosen = p;
 			*ppoints = points;
 			*ppoints = points;