diff --git a/[refs] b/[refs] index aba58498ae7b..ab91cf3a181d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27e89ae5d6e94e30231ee89a7736f62d84ba4c6f +refs/heads/master: d127027baf98dce3ca31bec18c2c0e048ceda7c4 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index 1a675e446ef2..16be7c9edfd7 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -2677,7 +2677,6 @@ static int proc_cpuset_show(struct seq_file *m, void *unused_v) if (!tsk) goto out_free; - retval = -EINVAL; rcu_read_lock(); css = task_subsys_state(tsk, cpuset_subsys_id); retval = cgroup_path(css->cgroup, buf, PAGE_SIZE);