Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2

[sfrench/cifs-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index beca7aaddb22df96849cac3363e1eeabcb5be808..77cb720fed4e2ea2783ceba3ede1cbdde6ab4867 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -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();