X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk.h;h=0dce92c37496faf8b187741de6d169869019e9b7;hb=90975ef71246c5c688ead04e8ff6f36dc92d28b3;hp=d2e49af90db548ffa68e950bd800a48fdde79a1d;hpb=71c21b4cf62177a9d1ea46ff4c6073c907122226;p=linux-2.6-omap-h63xx.git

diff --git a/block/blk.h b/block/blk.h
index d2e49af90db..3ee94358b43 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -99,13 +99,21 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)
 static inline int blk_cpu_to_group(int cpu)
 {
 #ifdef CONFIG_SCHED_MC
-	cpumask_t mask = cpu_coregroup_map(cpu);
-	return first_cpu(mask);
+	const struct cpumask *mask = cpu_coregroup_mask(cpu);
+	return cpumask_first(mask);
 #elif defined(CONFIG_SCHED_SMT)
-	return first_cpu(per_cpu(cpu_sibling_map, cpu));
+	return cpumask_first(topology_thread_cpumask(cpu));
 #else
 	return cpu;
 #endif
 }
 
+static inline int blk_do_io_stat(struct request_queue *q)
+{
+	if (q)
+		return blk_queue_io_stat(q);
+
+	return 0;
+}
+
 #endif