From 1b2507d1048f477441baf16d52ff521c9e1f7795 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Thu, 15 Oct 2020 15:10:26 +0800 Subject: [PATCH] mm/oom_kill.c: remove redundant OOM score normalization in select_bad_process() mainline inclusion from mainline-v5.3-rc1 commit 2c207985f354dfb549e5a543102a3e084eea81f6 category: bugfix bugzilla: 34611 CVE: NA ------------------------------------------------- Since commit bbbe48029720 ("mm, oom: remove 'prefer children over parent' heuristic") removed the "%s: Kill process %d (%s) score %u or sacrifice child\n" line, oc->chosen_points is no longer used after select_bad_process(). Link: http://lkml.kernel.org/r/1560853435-15575-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp Signed-off-by: Tetsuo Handa Acked-by: Michal Hocko Cc: Shakeel Butt Cc: Roman Gushchin Cc: Johannes Weiner Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Liu Shixin Reviewed-by: Kefeng Wang Signed-off-by: Yang Yingliang --- mm/oom_kill.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 55410ef265d6..dee2f9d50e36 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -380,8 +380,6 @@ static void select_bad_process(struct oom_control *oc) break; rcu_read_unlock(); } - - oc->chosen_points = oc->chosen_points * 1000 / oc->totalpages; } /** -- GitLab