diff options
-rw-r--r-- | kernel/cpuset.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 1d8c0472bfb0..7c0e8da59e26 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -696,11 +696,8 @@ restart: | |||
696 | if (nslot == ndoms) { | 696 | if (nslot == ndoms) { |
697 | static int warnings = 10; | 697 | static int warnings = 10; |
698 | if (warnings) { | 698 | if (warnings) { |
699 | printk(KERN_WARNING | 699 | pr_warn("rebuild_sched_domains confused: nslot %d, ndoms %d, csn %d, i %d, apn %d\n", |
700 | "rebuild_sched_domains confused:" | 700 | nslot, ndoms, csn, i, apn); |
701 | " nslot %d, ndoms %d, csn %d, i %d," | ||
702 | " apn %d\n", | ||
703 | nslot, ndoms, csn, i, apn); | ||
704 | warnings--; | 701 | warnings--; |
705 | } | 702 | } |
706 | continue; | 703 | continue; |
@@ -2018,7 +2015,7 @@ static void remove_tasks_in_empty_cpuset(struct cpuset *cs) | |||
2018 | parent = parent_cs(parent); | 2015 | parent = parent_cs(parent); |
2019 | 2016 | ||
2020 | if (cgroup_transfer_tasks(parent->css.cgroup, cs->css.cgroup)) { | 2017 | if (cgroup_transfer_tasks(parent->css.cgroup, cs->css.cgroup)) { |
2021 | printk(KERN_ERR "cpuset: failed to transfer tasks out of empty cpuset "); | 2018 | pr_err("cpuset: failed to transfer tasks out of empty cpuset "); |
2022 | pr_cont_cgroup_name(cs->css.cgroup); | 2019 | pr_cont_cgroup_name(cs->css.cgroup); |
2023 | pr_cont("\n"); | 2020 | pr_cont("\n"); |
2024 | } | 2021 | } |
@@ -2555,7 +2552,7 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk) | |||
2555 | cgrp = task_cs(tsk)->css.cgroup; | 2552 | cgrp = task_cs(tsk)->css.cgroup; |
2556 | nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN, | 2553 | nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN, |
2557 | tsk->mems_allowed); | 2554 | tsk->mems_allowed); |
2558 | printk(KERN_INFO "%s cpuset=", tsk->comm); | 2555 | pr_info("%s cpuset=", tsk->comm); |
2559 | pr_cont_cgroup_name(cgrp); | 2556 | pr_cont_cgroup_name(cgrp); |
2560 | pr_cont(" mems_allowed=%s\n", cpuset_nodelist); | 2557 | pr_cont(" mems_allowed=%s\n", cpuset_nodelist); |
2561 | 2558 | ||