Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  stop_machine: fix error code handling on multiple cpus
  stop_machine: use workqueues instead of kernel threads
  workqueue: introduce create_rt_workqueue
  Call init_workqueues before pre smp initcalls.
  Make panic= and panic_on_oops into core_params
  Make initcall_debug a core_param
  core_param() for genuinely core kernel parameters
  param: Fix duplicate module prefixes
  module: check kernel param length at compile time, not runtime
  Remove stop_machine during module load v2
  module: simplify load_module.

diff --combined init/main.c
index 672ae75b20596c3e5359011e49e63f895f5bb9a8,6c7fd137c8cdc8454ea8b3ab8356e89dac183427..b038fa142041eadc67369792aeeb97492c2819dd
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -52,7 -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>
@@@ -648,7 -647,6 +648,7 @@@ asmlinkage void __init start_kernel(voi
        vmalloc_init();
        vfs_caches_init_early();
        cpuset_init_early();
 +      page_cgroup_init();
        mem_init();
        enable_debug_pagealloc();
        cpu_hotplug_init();
@@@ -699,13 -697,7 +699,7 @@@
  }
  
  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)
  {
@@@ -775,8 -767,6 +769,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();
@@@ -860,6 -850,8 +852,8 @@@ static int __init kernel_init(void * un
  
        cad_pid = task_pid(current);
  
+       init_workqueues();
+ 
        smp_prepare_cpus(setup_max_cpus);
  
        do_pre_smp_initcalls();