diff options
| author | Ishan Mittal <imittal@nvidia.com> | 2014-06-05 13:31:21 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-06-05 13:37:37 +0530 |
| commit | dce68ca8e1015cf5bcd33284c0c1c9191e79885d (patch) | |
| tree | 7fed5c66956b9ffeadac67750aa042fc9b70f1a1 /kernel/cpuset.c | |
| parent | 60ca8709496cbcfe7dc931a2ec8786f82b2761eb (diff) | |
| parent | be67db109090b17b56eb8eb2190cd70700f107aa (diff) | |
Merge branch 'linux-3.10.40' into rel-21
Bug 200004122
Conflicts:
drivers/cpufreq/cpufreq.c
drivers/regulator/core.c
sound/soc/codecs/max98090.c
Change-Id: I9418a05ad5c56b2e902249218bac2fa594d99f56
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'kernel/cpuset.c')
| -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 d313870dcd02..d9dd521ddd6b 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -2422,9 +2422,9 @@ int __cpuset_node_allowed_softwall(int node, gfp_t gfp_mask) task_lock(current); cs = nearest_hardwall_ancestor(task_cs(current)); + allowed = node_isset(node, cs->mems_allowed); task_unlock(current); - allowed = node_isset(node, cs->mems_allowed); mutex_unlock(&callback_mutex); return allowed; } |