---

yaml --- r: 210528 b: refs/heads/master c: be14eb6 h: refs/heads/master v: v3
git-mirror · Sep 10, 2010 · 1f9c6d1 · 1f9c6d1
1 parent 00655ce
commit 1f9c6d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edce6820a9fdda85521211cb334a183e34cc455e
+refs/heads/master: be14eb619108fa8b7120eb2c42d66d5f623ae10e
diff --git a/trunk/block/blk.h b/trunk/block/blk.h
@@ -142,14 +142,18 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)
 
 static inline int blk_cpu_to_group(int cpu)
 {
+	int group = NR_CPUS;
 #ifdef CONFIG_SCHED_MC
 	const struct cpumask *mask = cpu_coregroup_mask(cpu);
-	return cpumask_first(mask);
+	group = cpumask_first(mask);
 #elif defined(CONFIG_SCHED_SMT)
-	return cpumask_first(topology_thread_cpumask(cpu));
+	group = cpumask_first(topology_thread_cpumask(cpu));
 #else
 	return cpu;
 #endif
+	if (likely(group < NR_CPUS))
+		return group;
+	return cpu;
 }
 
 /*