Merge branch 'linus' into x86/kconfig

1 files changed, 8 insertions, 2 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 039baa4cd90c..9fceb97e989c 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1037,8 +1037,8 @@ int current_cpuset_is_being_rebound(void)
 
 static int update_relax_domain_level(struct cpuset *cs, s64 val)
 {
-        if ((int)val < 0)
-                val = -1;
+        if (val < -1 || val >= SD_LV_MAX)
+                return -EINVAL;
 
         if (val != cs->relax_domain_level) {
                 cs->relax_domain_level = val;
@@ -1890,6 +1890,12 @@ static void common_cpu_mem_hotplug_unplug(void)
         top_cpuset.mems_allowed = node_states[N_HIGH_MEMORY];
         scan_for_empty_cpusets(&top_cpuset);
 
+        /*
+         * Scheduler destroys domains on hotplug events.
+         * Rebuild them based on the current settings.
+         */
+        rebuild_sched_domains();
+
         cgroup_unlock();
 }