diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2013-03-06 19:12:15 +0530 |
|---|---|---|
| committer | Sachin Nikam <snikam@nvidia.com> | 2013-03-06 19:31:07 +0530 |
| commit | d3dd6b4227fe3e59df0a55f679ec196e4ccb1e3a (patch) | |
| tree | 0137a07ecab729a19cea68b671c88def5bf83a2d /kernel/cpuset.c | |
| parent | bb36790494c382ec26250f351c8cea76613f0f02 (diff) | |
| parent | 2713e2797a78a0fdda765bc5ad7fed41e94818ba (diff) | |
Merge branch 'linux-3.4.35' into rel-17
Bug 1243631
Change-Id: I915826047b2e20f0ad0a7d75df295c6cbf6e5b0a
Diffstat (limited to 'kernel/cpuset.c')
| -rw-r--r-- | kernel/cpuset.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 48b90d30797f..de11f2f560de 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -2100,6 +2100,9 @@ static void scan_for_empty_cpusets(struct cpuset *root) * (of no affect) on systems that are actively using CPU hotplug * but making no active use of cpusets. * + * The only exception to this is suspend/resume, where we don't + * modify cpusets at all. + * * This routine ensures that top_cpuset.cpus_allowed tracks * cpu_active_mask on each CPU hotplug (cpuhp) event. * @@ -2511,8 +2514,16 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk) dentry = task_cs(tsk)->css.cgroup->dentry; spin_lock(&cpuset_buffer_lock); - snprintf(cpuset_name, CPUSET_NAME_LEN, - dentry ? (const char *)dentry->d_name.name : "/"); + + if (!dentry) { + strcpy(cpuset_name, "/"); + } else { + spin_lock(&dentry->d_lock); + strlcpy(cpuset_name, (const char *)dentry->d_name.name, + CPUSET_NAME_LEN); + spin_unlock(&dentry->d_lock); + } + nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN, tsk->mems_allowed); printk(KERN_INFO "%s cpuset=%s mems_allowed=%s\n", |