diff --git a/[refs] b/[refs] index 5d806b39340d..619a731fcd4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40bb0c3ef52d872de348e10000eb5432a43a147d +refs/heads/master: 3725822f7c7134249addcd4549aff086950c8090 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index e0d296c5b302..d7f4d0c95737 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -645,7 +645,9 @@ static void update_cpu_domains(struct cpuset *cur) int i, j; for_each_cpu_mask(i, cur->cpus_allowed) { - for_each_cpu_mask(j, node_to_cpumask(cpu_to_node(i))) { + cpumask_t mask = node_to_cpumask(cpu_to_node(i)); + + for_each_cpu_mask(j, mask) { if (!cpu_isset(j, cur->cpus_allowed)) return; }