oom: /proc/<pid>/oom_score treat kernel thread honestly

[net-next-2.6.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index acb7ef80ea4fcc4987b0b2159f70d599f659c31e..fc23f62bb0b8dd5b54caf3cfc0846580a9f0a531 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -428,7 +428,8 @@ static const struct file_operations proc_lstats_operations = {
 #endif
 
 /* The badness from the OOM killer */
-unsigned long badness(struct task_struct *p, unsigned long uptime);
+unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
+                     nodemask_t *nodemask, unsigned long uptime);
 static int proc_oom_score(struct task_struct *task, char *buffer)
 {
        unsigned long points = 0;
@@ -437,7 +438,7 @@ static int proc_oom_score(struct task_struct *task, char *buffer)
        do_posix_clock_monotonic_gettime(&uptime);
        read_lock(&tasklist_lock);
        if (pid_alive(task))
-               points = badness(task, uptime.tv_sec);
+               points = badness(task, NULL, NULL, uptime.tv_sec);
        read_unlock(&tasklist_lock);
        return sprintf(buffer, "%lu\n", points);
 }