From c42609326bcfc0d673b8f0f6df765ed299369370 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 2 Dec 2009 14:09:16 +1030
Subject: [PATCH] --- yaml --- r: 169915 b: refs/heads/master c:
 bdddd2963c0264c56f18043f6fa829d3c1d3d1c0 h: refs/heads/master i:   169913:
 75f3111483b3814fa91ebc519b6a315ea23d5319   169911:
 66874cff088d367ed6c9d404156f21c6721867c0 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dbfea83eba93..f51cac1da26f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8592e6486a177a02f048567cb928bc3a1f9a86c3
+refs/heads/master: bdddd2963c0264c56f18043f6fa829d3c1d3d1c0
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 1031cae39c4c..4883fee99314 100644
--- a/trunk/kernel/sched.c
+++ b/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();