X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=init%2Fmain.c;h=130d1a0eef113ef62f873d386f689f8533591d28;hb=97ae60bb38279e1941c738b1037a57e6b14efeaf;hp=672ae75b20596c3e5359011e49e63f895f5bb9a8;hpb=e82cff752f57810a2259415ad2e9087c2d69484c;p=linux-2.6-omap-h63xx.git diff --git a/init/main.c b/init/main.c index 672ae75b205..130d1a0eef1 100644 --- a/init/main.c +++ b/init/main.c @@ -672,7 +672,6 @@ asmlinkage void __init start_kernel(void) fork_init(num_physpages); proc_caches_init(); buffer_init(); - unnamed_dev_init(); key_init(); security_init(); vfs_caches_init(num_physpages); @@ -699,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) { @@ -775,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(); @@ -860,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();