diff --git a/[refs] b/[refs] index 409b8d2c5386..100aaa8539ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36920e069a87c6fccffbc0ec5e74985d94d3bcc4 +refs/heads/master: 0d673a5a4775d3dc565b6668ed75fd2db2ede624 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index f1dda98bdffe..4ea6f0dc2fc5 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -2420,7 +2420,7 @@ EXPORT_SYMBOL_GPL(cpuset_mem_spread_node); int cpuset_excl_nodes_overlap(const struct task_struct *p) { const struct cpuset *cs1, *cs2; /* my and p's cpuset ancestors */ - int overlap = 0; /* do cpusets overlap? */ + int overlap = 1; /* do cpusets overlap? */ task_lock(current); if (current->flags & PF_EXITING) {