|
@@ -411,7 +411,8 @@ static const struct file_operations proc_cpuset_operations = {
|
|
|
};
|
|
|
#endif
|
|
|
|
|
|
-static int proc_oom_score(struct task_struct *task, char *buffer)
|
|
|
+static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns,
|
|
|
+ struct pid *pid, struct task_struct *task)
|
|
|
{
|
|
|
unsigned long totalpages = totalram_pages + total_swap_pages;
|
|
|
unsigned long points = 0;
|
|
@@ -421,7 +422,7 @@ static int proc_oom_score(struct task_struct *task, char *buffer)
|
|
|
points = oom_badness(task, NULL, NULL, totalpages) *
|
|
|
1000 / totalpages;
|
|
|
read_unlock(&tasklist_lock);
|
|
|
- return sprintf(buffer, "%lu\n", points);
|
|
|
+ return seq_printf(m, "%lu\n", points);
|
|
|
}
|
|
|
|
|
|
struct limit_names {
|
|
@@ -2616,7 +2617,7 @@ static const struct pid_entry tgid_base_stuff[] = {
|
|
|
#ifdef CONFIG_CGROUPS
|
|
|
REG("cgroup", S_IRUGO, proc_cgroup_operations),
|
|
|
#endif
|
|
|
- INF("oom_score", S_IRUGO, proc_oom_score),
|
|
|
+ ONE("oom_score", S_IRUGO, proc_oom_score),
|
|
|
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
|
|
|
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
|
|
|
#ifdef CONFIG_AUDITSYSCALL
|
|
@@ -2954,7 +2955,7 @@ static const struct pid_entry tid_base_stuff[] = {
|
|
|
#ifdef CONFIG_CGROUPS
|
|
|
REG("cgroup", S_IRUGO, proc_cgroup_operations),
|
|
|
#endif
|
|
|
- INF("oom_score", S_IRUGO, proc_oom_score),
|
|
|
+ ONE("oom_score", S_IRUGO, proc_oom_score),
|
|
|
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
|
|
|
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
|
|
|
#ifdef CONFIG_AUDITSYSCALL
|