MIPS: SEAD3: Use symbolic addresses from sead-addr.h in LED driver.

[linux-drm-fsl-dcu.git] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 64b257f6bca2e23118363660bc6a263ced933e9f..fc7f4748d34a9fe017bd9a42353db7a4095240d2 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -548,9 +548,6 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr,
 
        rcu_read_lock();
        cpuset_for_each_descendant_pre(cp, pos_css, root_cs) {
-               if (cp == root_cs)
-                       continue;
-
                /* skip the whole subtree if @cp doesn't have any CPU */
                if (cpumask_empty(cp->cpus_allowed)) {
                        pos_css = css_rightmost_descendant(pos_css);
@@ -873,7 +870,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus)
                 * If it becomes empty, inherit the effective mask of the
                 * parent, which is guaranteed to have some CPUs.
                 */
-               if (cpumask_empty(new_cpus))
+               if (cgroup_on_dfl(cp->css.cgroup) && cpumask_empty(new_cpus))
                        cpumask_copy(new_cpus, parent->effective_cpus);
 
                /* Skip the whole subtree if the cpumask remains the same. */
@@ -1129,7 +1126,7 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems)
                 * If it becomes empty, inherit the effective mask of the
                 * parent, which is guaranteed to have some MEMs.
                 */
-               if (nodes_empty(*new_mems))
+               if (cgroup_on_dfl(cp->css.cgroup) && nodes_empty(*new_mems))
                        *new_mems = parent->effective_mems;
 
                /* Skip the whole subtree if the nodemask remains the same. */
@@ -1707,40 +1704,27 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
 {
        struct cpuset *cs = css_cs(seq_css(sf));
        cpuset_filetype_t type = seq_cft(sf)->private;
-       ssize_t count;
-       char *buf, *s;
        int ret = 0;
 
-       count = seq_get_buf(sf, &buf);
-       s = buf;
-
        spin_lock_irq(&callback_lock);
 
        switch (type) {
        case FILE_CPULIST:
-               s += cpulist_scnprintf(s, count, cs->cpus_allowed);
+               seq_printf(sf, "%*pbl\n", cpumask_pr_args(cs->cpus_allowed));
                break;
        case FILE_MEMLIST:
-               s += nodelist_scnprintf(s, count, cs->mems_allowed);
+               seq_printf(sf, "%*pbl\n", nodemask_pr_args(&cs->mems_allowed));
                break;
        case FILE_EFFECTIVE_CPULIST:
-               s += cpulist_scnprintf(s, count, cs->effective_cpus);
+               seq_printf(sf, "%*pbl\n", cpumask_pr_args(cs->effective_cpus));
                break;
        case FILE_EFFECTIVE_MEMLIST:
-               s += nodelist_scnprintf(s, count, cs->effective_mems);
+               seq_printf(sf, "%*pbl\n", nodemask_pr_args(&cs->effective_mems));
                break;
        default:
                ret = -EINVAL;
-               goto out_unlock;
        }
 
-       if (s < buf + count - 1) {
-               *s++ = '\n';
-               seq_commit(sf, s - buf);
-       } else {
-               seq_commit(sf, -1);
-       }
-out_unlock:
        spin_unlock_irq(&callback_lock);
        return ret;
 }
@@ -1992,7 +1976,9 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
 
        spin_lock_irq(&callback_lock);
        cs->mems_allowed = parent->mems_allowed;
+       cs->effective_mems = parent->mems_allowed;
        cpumask_copy(cs->cpus_allowed, parent->cpus_allowed);
+       cpumask_copy(cs->effective_cpus, parent->cpus_allowed);
        spin_unlock_irq(&callback_lock);
 out_unlock:
        mutex_unlock(&cpuset_mutex);
@@ -2400,7 +2386,7 @@ void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
         */
 }
 
-void cpuset_init_current_mems_allowed(void)
+void __init cpuset_init_current_mems_allowed(void)
 {
        nodes_setall(current->mems_allowed);
 }
@@ -2610,8 +2596,6 @@ int cpuset_mems_allowed_intersects(const struct task_struct *tsk1,
        return nodes_intersects(tsk1->mems_allowed, tsk2->mems_allowed);
 }
 
-#define CPUSET_NODELIST_LEN    (256)
-
 /**
  * cpuset_print_task_mems_allowed - prints task's cpuset and mems_allowed
  * @tsk: pointer to task_struct of some task.
@@ -2621,23 +2605,16 @@ int cpuset_mems_allowed_intersects(const struct task_struct *tsk1,
  */
 void cpuset_print_task_mems_allowed(struct task_struct *tsk)
 {
-        /* Statically allocated to prevent using excess stack. */
-       static char cpuset_nodelist[CPUSET_NODELIST_LEN];
-       static DEFINE_SPINLOCK(cpuset_buffer_lock);
        struct cgroup *cgrp;
 
-       spin_lock(&cpuset_buffer_lock);
        rcu_read_lock();
 
        cgrp = task_cs(tsk)->css.cgroup;
-       nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN,
-                          tsk->mems_allowed);
        pr_info("%s cpuset=", tsk->comm);
        pr_cont_cgroup_name(cgrp);
-       pr_cont(" mems_allowed=%s\n", cpuset_nodelist);
+       pr_cont(" mems_allowed=%*pbl\n", nodemask_pr_args(&tsk->mems_allowed));
 
        rcu_read_unlock();
-       spin_unlock(&cpuset_buffer_lock);
 }
 
 /*
@@ -2715,10 +2692,8 @@ out:
 /* Display task mems_allowed in /proc/<pid>/status file. */
 void cpuset_task_status_allowed(struct seq_file *m, struct task_struct *task)
 {
-       seq_puts(m, "Mems_allowed:\t");
-       seq_nodemask(m, &task->mems_allowed);
-       seq_puts(m, "\n");
-       seq_puts(m, "Mems_allowed_list:\t");
-       seq_nodemask_list(m, &task->mems_allowed);
-       seq_puts(m, "\n");
+       seq_printf(m, "Mems_allowed:\t%*pb\n",
+                  nodemask_pr_args(&task->mems_allowed));
+       seq_printf(m, "Mems_allowed_list:\t%*pbl\n",
+                  nodemask_pr_args(&task->mems_allowed));
 }