Export the oom_evaluate_task() and select_bad_process() functions to reuse them for victim selection logic in the cgroup-aware OOM killer.
Signed-off-by: Roman Gushchin <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Li Zefan <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Vladimir Davydov <[email protected]> Cc: Tetsuo Handa <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] --- include/linux/oom.h | 3 +++ mm/oom_kill.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/oom.h b/include/linux/oom.h index 47d9495..edf7a77 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -80,6 +80,9 @@ extern void oom_killer_enable(void); extern struct task_struct *find_lock_task_mm(struct task_struct *p); extern void __oom_kill_process(struct task_struct *victim); +extern int oom_evaluate_task(struct task_struct *task, void *arg); +extern void select_bad_process(struct oom_control *oc, + struct mem_cgroup *memcg); /* sysctls */ extern int sysctl_oom_dump_tasks; diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 11b60a5..8cf77fb 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -288,7 +288,7 @@ static enum oom_constraint constrained_alloc(struct oom_control *oc) return CONSTRAINT_NONE; } -static int oom_evaluate_task(struct task_struct *task, void *arg) +int oom_evaluate_task(struct task_struct *task, void *arg) { struct oom_control *oc = arg; unsigned long points; @@ -343,8 +343,7 @@ static int oom_evaluate_task(struct task_struct *task, void *arg) * Simple selection loop. We choose the process with the highest number of * 'points'. In case scan was aborted, oc->chosen is set to -1. */ -static void select_bad_process(struct oom_control *oc, - struct mem_cgroup *memcg) +void select_bad_process(struct oom_control *oc, struct mem_cgroup *memcg) { if (memcg) mem_cgroup_scan_tasks(memcg, oom_evaluate_task, oc); -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
