sched/cpuset/pm: Fix cpuset vs. suspend-resume bugs

[mirror_ubuntu-artful-kernel.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 0869b20fba81f6f1a7f5f73bde65fadc483f0fa2..99326c370c9c119c5dcf528aaddc66a62f49152a 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5538,16 +5538,15 @@ static void cpuset_cpu_active(void)
                 * operation in the resume sequence, just build a single sched
                 * domain, ignoring cpusets.
                 */
-               num_cpus_frozen--;
-               if (likely(num_cpus_frozen)) {
-                       partition_sched_domains(1, NULL, NULL);
+               partition_sched_domains(1, NULL, NULL);
+               if (--num_cpus_frozen)
                        return;
-               }
                /*
                 * This is the last CPU online operation. So fall through and
                 * restore the original sched domains by considering the
                 * cpuset configurations.
                 */
+               cpuset_force_rebuild();
        }
        cpuset_update_active_cpus();
 }