Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

cgroup/for-3.5 contains the following changes which blk-cgroup needs
to proceed with the on-going cleanup.

* Dynamic addition and removal of cftypes to make config/stat file
  handling modular for policies.

* cgroup removal update to not wait for css references to drain to fix
  blkcg removal hang caused by cfq caching cfqgs.

Pull in cgroup/for-3.5 into block/for-3.5/core.  This causes the
following conflicts in block/blk-cgroup.c.

* 761b3ef50e "cgroup: remove cgroup_subsys argument from callbacks"
  conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()
  removal.  Resolved by removing @subsys from all subsys methods.

* 676f7c8f84 "cgroup: relocate cftype and cgroup_subsys definitions in
  controllers" conflicts with ->pre_destroy() and ->attach() updates
  and removal of modular config.  Resolved by dropping forward
  declarations of the methods and applying updates to the relocated
  blkio_subsys.

* 4baf6e3325 "cgroup: convert all non-memcg controllers to the new
  cftype interface" builds upon the previous item.  Resolved by adding
  ->base_cftypes to the relocated blkio_subsys.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 0 insertions, 16 deletions

diff --git a/block/blk.h b/block/blk.h
index aa81afde8220..85f6ae42f7d3 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -164,22 +164,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:
  *