oom: cleanup oom_kill_task __oom_kill_task() only has a single caller, so merge it into that function. Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: David Rientjes --- mm/oom_kill.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -415,17 +415,6 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, dump_tasks(mem); } -/* - * Give the oom killed task high priority and access to memory reserves so that - * it may quickly exit and free its memory. - */ -static void __oom_kill_task(struct task_struct *p) -{ - p->rt.time_slice = HZ; - set_tsk_thread_flag(p, TIF_MEMDIE); - force_sig(SIGKILL, p); -} - #define K(x) ((x) << (PAGE_SHIFT-10)) static int oom_kill_task(struct task_struct *p) { @@ -440,7 +429,9 @@ static int oom_kill_task(struct task_struct *p) K(get_mm_counter(p->mm, MM_FILEPAGES))); task_unlock(p); - __oom_kill_task(p); + p->rt.time_slice = HZ; + set_tsk_thread_flag(p, TIF_MEMDIE); + force_sig(SIGKILL, p); return 0; } #undef K