lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into tracing/kmemtrace

Browse Source 
Conflicts:
	mm/slub.c
This commit is contained in:
Ingo Molnar
2008-12-31 08:14:29 +01:00
parent 7a51cffbd1 6a94cb7306
commit 5fdf7e5975
2084 changed files with 144450 additions and 50561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
init/main.c
View File

@ -541,6 +541,15 @@ void __init __weak thread_info_cache_init(void)
{
}
void __init __weak arch_early_irq_init(void)
{
}
void __init __weak early_irq_init(void)
{
arch_early_irq_init();
}
asmlinkage void __init start_kernel(void)
{
char * command_line;
@ -605,6 +614,8 @@ asmlinkage void __init start_kernel(void)
sort_main_extable();
trap_init();
rcu_init();
/* init some links before init_ISA_irqs() */
early_irq_init();
init_IRQ();
pidhash_init();
init_timers();