aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 13:00:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 13:00:14 -0400
commita5344876065e047d507800d0801a637d68d3b129 (patch)
tree240173ed2f588a1c61aff9bb513255f99b0cd6a2 /init/main.c
parent296e1ce0dc36bb106c139e25482d02da43c70e71 (diff)
parent8163bcac779f62c6bf847caed9bce905db0693fb (diff)
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.
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/init/main.c b/init/main.c
index 672ae75b2059..b038fa142041 100644
--- a/init/main.c
+++ b/init/main.c
@@ -699,13 +699,7 @@ asmlinkage void __init start_kernel(void)
699} 699}
700 700
701static int initcall_debug; 701static int initcall_debug;
702 702core_param(initcall_debug, initcall_debug, bool, 0644);
703static int __init initcall_debug_setup(char *str)
704{
705 initcall_debug = 1;
706 return 1;
707}
708__setup("initcall_debug", initcall_debug_setup);
709 703
710int do_one_initcall(initcall_t fn) 704int do_one_initcall(initcall_t fn)
711{ 705{
@@ -775,8 +769,6 @@ static void __init do_initcalls(void)
775static void __init do_basic_setup(void) 769static void __init do_basic_setup(void)
776{ 770{
777 rcu_init_sched(); /* needed by module_init stage. */ 771 rcu_init_sched(); /* needed by module_init stage. */
778 /* drivers will send hotplug events */
779 init_workqueues();
780 usermodehelper_init(); 772 usermodehelper_init();
781 driver_init(); 773 driver_init();
782 init_irq_proc(); 774 init_irq_proc();
@@ -860,6 +852,8 @@ static int __init kernel_init(void * unused)
860 852
861 cad_pid = task_pid(current); 853 cad_pid = task_pid(current);
862 854
855 init_workqueues();
856
863 smp_prepare_cpus(setup_max_cpus); 857 smp_prepare_cpus(setup_max_cpus);
864 858
865 do_pre_smp_initcalls(); 859 do_pre_smp_initcalls();