1 files changed, 6 insertions, 11 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index ac7276c40685..fd1785e4c9bb 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -361,12 +361,15 @@ void __init setup_system(void)
 
         /*
          * Fill the ppc64_caches & systemcfg structures with informations
-         * retrieved from the device-tree. Need to be called before
-         * finish_device_tree() since the later requires some of the
-         * informations filled up here to properly parse the interrupt tree.
+         * retrieved from the device-tree.
          */
         initialize_cache_info();
 
+        /*
+         * Initialize irq remapping subsystem
+         */
+        irq_early_init();
+
 #ifdef CONFIG_PPC_RTAS
         /*
          * Initialize RTAS if available
@@ -394,12 +397,6 @@ void __init setup_system(void)
         find_legacy_serial_ports();
 
         /*
-         * "Finish" the device-tree, that is do the actual parsing of
-         * some of the properties like the interrupt map
-         */
-        finish_device_tree();
-
-        /*
          * Initialize xmon
          */
 #ifdef CONFIG_XMON_DEFAULT
@@ -427,8 +424,6 @@ void __init setup_system(void)
 
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
-        printk("ppc64_interrupt_controller    = 0x%ld\n",
-               ppc64_interrupt_controller);
         printk("physicalMemorySize            = 0x%lx\n", lmb_phys_mem_size());
         printk("ppc64_caches.dcache_line_size = 0x%x\n",
                ppc64_caches.dline_size);