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, 62 insertions, 13 deletions

diff --git a/init/main.c b/init/main.c
index ff49a6dacfbb..9d454f09f3b1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -87,7 +87,6 @@ extern void mca_init(void);
 extern void sbus_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
-extern void free_initmem(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
 #endif
@@ -374,11 +373,8 @@ static noinline void __init_refok rest_init(void)
          * at least once to get things moving:
          */
         init_idle_bootup_task(current);
-        preempt_enable_no_resched();
-        schedule();
-
+        schedule_preempt_disabled();
         /* Call into cpu_idle with preempt disabled */
-        preempt_disable();
         cpu_idle();
 }
 
@@ -403,7 +399,7 @@ static int __init do_early_param(char *param, char *val)
 
 void __init parse_early_options(char *cmdline)
 {
-        parse_args("early options", cmdline, NULL, 0, do_early_param);
+        parse_args("early options", cmdline, NULL, 0, 0, 0, do_early_param);
 }
 
 /* Arch code calls this early on, or if not, just before other parsing. */
@@ -449,8 +445,8 @@ void __init __weak thread_info_cache_init(void)
 static void __init mm_init(void)
 {
         /*
-         * page_cgroup requires countinous pages as memmap
-         * and it's bigger than MAX_ORDER unless SPARSEMEM.
+         * page_cgroup requires contiguous pages,
+         * bigger than MAX_ORDER unless SPARSEMEM.
          */
         page_cgroup_init_flatmem();
         mem_init();
@@ -506,7 +502,7 @@ asmlinkage void __init start_kernel(void)
         parse_early_param();
         parse_args("Booting kernel", static_command_line, __start___param,
                    __stop___param - __start___param,
-                   &unknown_bootoption);
+                   0, 0, &unknown_bootoption);
 
         jump_label_init();
 
@@ -702,16 +698,69 @@ int __init_or_module do_one_initcall(initcall_t fn)
 }
 
 
-extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
+extern initcall_t __initcall_start[];
+extern initcall_t __initcall0_start[];
+extern initcall_t __initcall1_start[];
+extern initcall_t __initcall2_start[];
+extern initcall_t __initcall3_start[];
+extern initcall_t __initcall4_start[];
+extern initcall_t __initcall5_start[];
+extern initcall_t __initcall6_start[];
+extern initcall_t __initcall7_start[];
+extern initcall_t __initcall_end[];
+
+static initcall_t *initcall_levels[] __initdata = {
+        __initcall0_start,
+        __initcall1_start,
+        __initcall2_start,
+        __initcall3_start,
+        __initcall4_start,
+        __initcall5_start,
+        __initcall6_start,
+        __initcall7_start,
+        __initcall_end,
+};
+
+static char *initcall_level_names[] __initdata = {
+        "early parameters",
+        "core parameters",
+        "postcore parameters",
+        "arch parameters",
+        "subsys parameters",
+        "fs parameters",
+        "device parameters",
+        "late parameters",
+};
+
+static int __init ignore_unknown_bootoption(char *param, char *val)
+{
+        return 0;
+}
 
-static void __init do_initcalls(void)
+static void __init do_initcall_level(int level)
 {
+        extern const struct kernel_param __start___param[], __stop___param[];
         initcall_t *fn;
 
-        for (fn = __early_initcall_end; fn < __initcall_end; fn++)
+        strcpy(static_command_line, saved_command_line);
+        parse_args(initcall_level_names[level],
+                   static_command_line, __start___param,
+                   __stop___param - __start___param,
+                   level, level,
+                   ignore_unknown_bootoption);
+
+        for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
                 do_one_initcall(*fn);
 }
 
+static void __init do_initcalls(void)
+{
+        int level;
+
+        for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++)
+                do_initcall_level(level);
+}
+
 /*
  * Ok, the machine is now initialized. None of the devices
  * have been touched yet, but the CPU subsystem is up and
@@ -735,7 +784,7 @@ static void __init do_pre_smp_initcalls(void)
 {
         initcall_t *fn;
 
-        for (fn = __initcall_start; fn < __early_initcall_end; fn++)
+        for (fn = __initcall_start; fn < __initcall0_start; fn++)
                 do_one_initcall(*fn);
 }