---

yaml
---
r: 333863
b: refs/heads/master
c: 5f7865f
h: refs/heads/master
i:
  333861: 9253240
  333859: 212c481
  333855: 88ced72
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b17c545a4cdbbbadcd7f1e9684c2d7db8f085a6
+refs/heads/master: 5f7865f3e44db4c73fdc454fb2af40806212a7ca

trunk/kernel/sched/core.c

@@ -6122,6 +6122,17 @@ static void sched_init_numa(void)
 	 * numbers.
 	 */
 
+	/*
+	 * Here, we should temporarily reset sched_domains_numa_levels to 0.
+	 * If it fails to allocate memory for array sched_domains_numa_masks[][],
+	 * the array will contain less then 'level' members. This could be
+	 * dangerous when we use it to iterate array sched_domains_numa_masks[][]
+	 * in other functions.
+	 *
+	 * We reset it to 'level' at the end of this function.
+	 */
+	sched_domains_numa_levels = 0;
+
 	sched_domains_numa_masks = kzalloc(sizeof(void *) * level, GFP_KERNEL);
 	if (!sched_domains_numa_masks)
 		return;
@@ -6176,6 +6187,8 @@ static void sched_init_numa(void)
 	}
 
 	sched_domain_topology = tl;
+
+	sched_domains_numa_levels = level;
 }
 #else
 static inline void sched_init_numa(void)