---

yaml
---
r: 169915
b: refs/heads/master
c: bdddd29
h: refs/heads/master
i:
  169913: 75f3111
  169911: 66874cf
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8592e6486a177a02f048567cb928bc3a1f9a86c3
+refs/heads/master: bdddd2963c0264c56f18043f6fa829d3c1d3d1c0

trunk/kernel/sched.c

@@ -8061,6 +8061,7 @@ static cpumask_var_t cpu_isolated_map;
 /* Setup the mask of cpus configured for isolated domains */
 static int __init isolated_cpu_setup(char *str)
 {
+	alloc_bootmem_cpumask_var(&cpu_isolated_map);
 	cpulist_parse(str, cpu_isolated_map);
 	return 1;
 }
@@ -9609,7 +9610,9 @@ void __init sched_init(void)
 	zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
 	alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
 #endif
-	zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
+	/* May be allocated at isolcpus cmdline parse time */
+	if (cpu_isolated_map == NULL)
+		zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
 #endif /* SMP */
 
 	perf_event_init();