ARM: imx_v6_v7_defconfig: add CONFIG_I2C_MUX_GPIO

[karo-tx-linux.git] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 41989ab4db571cbf93d1a12738bc9afc3411e019..00ab5c2b7c5b9df67dfd57f0b91b16bf3bd80960 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -2089,7 +2089,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = {
        .attach         = cpuset_attach,
        .bind           = cpuset_bind,
        .legacy_cftypes = files,
-       .early_init     = 1,
+       .early_init     = true,
 };
 
 /**
@@ -2714,10 +2714,10 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
                goto out;
 
        retval = -ENAMETOOLONG;
-       rcu_read_lock();
-       css = task_css(tsk, cpuset_cgrp_id);
-       p = cgroup_path(css->cgroup, buf, PATH_MAX);
-       rcu_read_unlock();
+       css = task_get_css(tsk, cpuset_cgrp_id);
+       p = cgroup_path_ns(css->cgroup, buf, PATH_MAX,
+                          current->nsproxy->cgroup_ns);
+       css_put(css);
        if (!p)
                goto out_free;
        seq_puts(m, p);