Merge tag 'pwm/for-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-2.6-block.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 31370da2ee7ce9ca2944eb22efb4d512681bc9dc..54e270262979b6f331a31b132171c0b74b92b920 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -579,11 +579,8 @@ static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns,
        unsigned long totalpages = totalram_pages + total_swap_pages;
        unsigned long points = 0;
 
-       read_lock(&tasklist_lock);
-       if (pid_alive(task))
-               points = oom_badness(task, NULL, NULL, totalpages) *
-                                               1000 / totalpages;
-       read_unlock(&tasklist_lock);
+       points = oom_badness(task, NULL, NULL, totalpages) *
+                                       1000 / totalpages;
        seq_printf(m, "%lu\n", points);
 
        return 0;