Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler changes for v3.4 from Ingo Molnar

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  printk: Make it compile with !CONFIG_PRINTK
  sched/x86: Fix overflow in cyc2ns_offset
  sched: Fix nohz load accounting -- again!
  sched: Update yield() docs
  printk/sched: Introduce special printk_sched() for those awkward moments
  sched/nohz: Correctly initialize 'next_balance' in 'nohz' idle balancer
  sched: Cleanup cpu_active madness
  sched: Fix load-balance wreckage
  sched: Clean up parameter passing of proc_sched_autogroup_set_nice()
  sched: Ditch per cgroup task lists for load-balancing
  sched: Rename load-balancing fields
  sched: Move load-balancing arguments into helper struct
  sched/rt: Do not submit new work when PI-blocked
  sched/rt: Prevent idle task boosting
  sched/wait: Add __wake_up_all_locked() API
  sched/rt: Document scheduler related skip-resched-check sites
  sched/rt: Use schedule_preempt_disabled()
  sched/rt: Add schedule_preempt_disabled()
  sched/rt: Do not throttle when PI boosting
  sched/rt: Keep period timer ticking when rt throttling is active
  ...

2 files changed, 8 insertions, 24 deletions

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 1366a89d8e66..467c8de88642 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -8,6 +8,7 @@
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/cpu.h>
+#include <linux/sched.h>
 
 #include "blk.h"
 
@@ -103,9 +104,10 @@ static struct notifier_block __cpuinitdata blk_cpu_notifier = {
 
 void __blk_complete_request(struct request *req)
 {
-        int ccpu, cpu, group_cpu = NR_CPUS;
+        int ccpu, cpu;
         struct request_queue *q = req->q;
         unsigned long flags;
+        bool shared = false;
 
         BUG_ON(!q->softirq_done_fn);
 
@@ -117,22 +119,20 @@ void __blk_complete_request(struct request *req)
          */
         if (req->cpu != -1) {
                 ccpu = req->cpu;
-                if (!test_bit(QUEUE_FLAG_SAME_FORCE, &q->queue_flags)) {
-                        ccpu = blk_cpu_to_group(ccpu);
-                        group_cpu = blk_cpu_to_group(cpu);
-                }
+                if (!test_bit(QUEUE_FLAG_SAME_FORCE, &q->queue_flags))
+                        shared = cpus_share_cache(cpu, ccpu);
         } else
                 ccpu = cpu;
 
         /*
-         * If current CPU and requested CPU are in the same group, running
-         * softirq in current CPU. One might concern this is just like
+         * If current CPU and requested CPU share a cache, run the softirq on
+         * the current CPU. One might concern this is just like
          * QUEUE_FLAG_SAME_FORCE, but actually not. blk_complete_request() is
          * running in interrupt handler, and currently I/O controller doesn't
          * support multiple interrupts, so current CPU is unique actually. This
          * avoids IPI sending from current CPU to the first CPU of a group.
          */
-        if (ccpu == cpu || ccpu == group_cpu) {
+        if (ccpu == cpu || shared) {
                 struct list_head *list;
 do_local:
                 list = &__get_cpu_var(blk_cpu_done);
diff --git a/block/blk.h b/block/blk.h
index 9c12f80882b0..d45be871329e 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -166,22 +166,6 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)
         return q->nr_congestion_off;
 }
 
-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);
-        group = cpumask_first(mask);
-#elif defined(CONFIG_SCHED_SMT)
-        group = cpumask_first(topology_thread_cpumask(cpu));
-#else
-        return cpu;
-#endif
-        if (likely(group < NR_CPUS))
-                return group;
-        return cpu;
-}
-
 /*
  * Contribute to IO statistics IFF:
  *