Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096

[mv-sheeva.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 79213c0785d293adc69165ec37899c2517793046..9d761aa53296b209243abdf005b6bf1f62ab86b9 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -540,6 +540,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;
@@ -604,6 +613,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();