---

yaml
---
r: 156253
b: refs/heads/master
c: 07903af
h: refs/heads/master
i:
  156251: ffa01da
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e414314cce7539788dd5d2c35decad11782dd858
+refs/heads/master: 07903af152b0597d94e9b0030746b63c4664e787

trunk/kernel/sched_cpupri.c

@@ -81,8 +81,21 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p,
 		if (cpumask_any_and(&p->cpus_allowed, vec->mask) >= nr_cpu_ids)
 			continue;
 
-		if (lowest_mask)
+		if (lowest_mask) {
 			cpumask_and(lowest_mask, &p->cpus_allowed, vec->mask);
+
+			/*
+			 * We have to ensure that we have at least one bit
+			 * still set in the array, since the map could have
+			 * been concurrently emptied between the first and
+			 * second reads of vec->mask.  If we hit this
+			 * condition, simply act as though we never hit this
+			 * priority level and continue on.
+			 */
+			if (cpumask_any(lowest_mask) >= nr_cpu_ids)
+				continue;
+		}
+
 		return 1;
 	}