1 files changed, 8 insertions, 16 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 22874d7cf2c0..1f107c74087b 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -365,13 +365,14 @@ static void cpuset_update_task_spread_flag(struct cpuset *cs,
                                         struct task_struct *tsk)
 {
         if (is_spread_page(cs))
-                tsk->flags |= PF_SPREAD_PAGE;
+                task_set_spread_page(tsk);
         else
-                tsk->flags &= ~PF_SPREAD_PAGE;
+                task_clear_spread_page(tsk);
+
         if (is_spread_slab(cs))
-                tsk->flags |= PF_SPREAD_SLAB;
+                task_set_spread_slab(tsk);
         else
-                tsk->flags &= ~PF_SPREAD_SLAB;
+                task_clear_spread_slab(tsk);
 }
 
 /*
@@ -2729,10 +2730,9 @@ void __cpuset_memory_pressure_bump(void)
  *    and we take cpuset_mutex, keeping cpuset_attach() from changing it
  *    anyway.
  */
-int proc_cpuset_show(struct seq_file *m, void *unused_v)
+int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
+                     struct pid *pid, struct task_struct *tsk)
 {
-        struct pid *pid;
-        struct task_struct *tsk;
         char *buf, *p;
         struct cgroup_subsys_state *css;
         int retval;
@@ -2742,24 +2742,16 @@ int proc_cpuset_show(struct seq_file *m, void *unused_v)
         if (!buf)
                 goto out;
 
-        retval = -ESRCH;
-        pid = m->private;
-        tsk = get_pid_task(pid, PIDTYPE_PID);
-        if (!tsk)
-                goto out_free;
-
         retval = -ENAMETOOLONG;
         rcu_read_lock();
         css = task_css(tsk, cpuset_cgrp_id);
         p = cgroup_path(css->cgroup, buf, PATH_MAX);
         rcu_read_unlock();
         if (!p)
-                goto out_put_task;
+                goto out_free;
         seq_puts(m, p);
         seq_putc(m, '\n');
         retval = 0;
-out_put_task:
-        put_task_struct(tsk);
 out_free:
         kfree(buf);
 out: