2 files changed, 7 insertions, 10 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 113c74c07da4..44e9208f9c78 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -739,7 +739,8 @@ config VM_EVENT_COUNTERS
 
 config PCI_QUIRKS
         default y
-        bool "Enable PCI quirk workarounds" if EMBEDDED && PCI
+        bool "Enable PCI quirk workarounds" if EMBEDDED
+        depends on PCI
         help
           This enables workarounds for various PCI chipset
           bugs/quirks. Disable this only if your target machine is
diff --git a/init/main.c b/init/main.c
index c6a1024a27a3..130d1a0eef11 100644
--- a/init/main.c
+++ b/init/main.c
@@ -52,6 +52,7 @@
 #include <linux/key.h>
 #include <linux/unwind.h>
 #include <linux/buffer_head.h>
+#include <linux/page_cgroup.h>
 #include <linux/debug_locks.h>
 #include <linux/debugobjects.h>
 #include <linux/lockdep.h>
@@ -647,6 +648,7 @@ asmlinkage void __init start_kernel(void)
         vmalloc_init();
         vfs_caches_init_early();
         cpuset_init_early();
+        page_cgroup_init();
         mem_init();
         enable_debug_pagealloc();
         cpu_hotplug_init();
@@ -696,13 +698,7 @@ asmlinkage void __init start_kernel(void)
 }
 
 static int initcall_debug;
-
-static int __init initcall_debug_setup(char *str)
-{
-        initcall_debug = 1;
-        return 1;
-}
-__setup("initcall_debug", initcall_debug_setup);
+core_param(initcall_debug, initcall_debug, bool, 0644);
 
 int do_one_initcall(initcall_t fn)
 {
@@ -772,8 +768,6 @@ static void __init do_initcalls(void)
 static void __init do_basic_setup(void)
 {
         rcu_init_sched(); /* needed by module_init stage. */
-        /* drivers will send hotplug events */
-        init_workqueues();
         usermodehelper_init();
         driver_init();
         init_irq_proc();
@@ -857,6 +851,8 @@ static int __init kernel_init(void * unused)
 
         cad_pid = task_pid(current);
 
+        init_workqueues();
+
         smp_prepare_cpus(setup_max_cpus);
 
         do_pre_smp_initcalls();