瀏覽代碼

mm: oom_kill: remove memcg argument from oom_kill_task()

The memcg argument of oom_kill_task() hasn't been used since 341aea2
'oom-kill: remove boost_dying_task_prio()'.  Kill it.

Signed-off-by: Johannes Weiner <jweiner@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Johannes Weiner 13 年之前
父節點
當前提交
ec0fffd84b
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      mm/oom_kill.c

+ 2 - 2
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))
 #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 task_struct *q;
 	struct mm_struct *mm;
 	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);
 	} while_each_thread(p, t);
 
 
-	return oom_kill_task(victim, mem);
+	return oom_kill_task(victim);
 }
 }
 
 
 /*
 /*