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.
这个提交包含在:
12
init/main.c
12
init/main.c
@@ -699,13 +699,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 +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 +852,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();
|
||||
|
在新工单中引用
屏蔽一个用户