diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-18 02:15:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-18 02:15:26 +0300 |
| commit | e9ab22d292aa168ed8d4cb45353a626a3d6f1522 (patch) | |
| tree | 6c4b46d8da56ac9010c2723090f049723cd9f0b0 | |
| parent | a36304b9e154ccaff67b1d1d0ece6ad6380e3648 (diff) | |
| parent | 24ee3cf89bef04e8bc23788aca4e029a3f0f06d9 (diff) | |
| download | linux-e9ab22d292aa168ed8d4cb45353a626a3d6f1522.tar.xz | |
Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"A fix for a subtle bug introduced back during 3.17 cycle which
interferes with setting configurations under specific conditions"
* 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: use trialcs->mems_allowed as a temp variable
| -rw-r--r-- | kernel/cpuset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index ee14e3a35a29..f0acff0f66c9 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1223,7 +1223,7 @@ static int update_nodemask(struct cpuset *cs, struct cpuset *trialcs, spin_unlock_irq(&callback_lock); /* use trialcs->mems_allowed as a temp variable */ - update_nodemasks_hier(cs, &cs->mems_allowed); + update_nodemasks_hier(cs, &trialcs->mems_allowed); done: return retval; } |