1 files changed, 2 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 617c724c4590..66c77e4f8ec2 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -81,8 +81,6 @@ static void iSeries_pci_final_fixup(void) { }
 #endif
 
 extern int rd_size;             /* Defined in drivers/block/rd.c */
-extern unsigned long embedded_sysmap_start;
-extern unsigned long embedded_sysmap_end;
 
 extern unsigned long iSeries_recal_tb;
 extern unsigned long iSeries_recal_titan;
@@ -321,11 +319,6 @@ static void __init iSeries_init_early(void)
         iSeries_recal_titan = HvCallXm_loadTod();
 
         /*
-         * Initialize the hash table management pointers
-         */
-        hpte_init_iSeries();
-
-        /*
          * Initialize the DMA/TCE management
          */
         iommu_init_early_iSeries();
@@ -563,16 +556,6 @@ static void __init iSeries_fixup_klimit(void)
         if (naca.xRamDisk)
                 klimit = KERNELBASE + (u64)naca.xRamDisk +
                         (naca.xRamDiskSize * HW_PAGE_SIZE);
-        else {
-                /*
-                 * No ram disk was included - check and see if there
-                 * was an embedded system map.  Change klimit to take
-                 * into account any embedded system map
-                 */
-                if (embedded_sysmap_end)
-                        klimit = KERNELBASE + ((embedded_sysmap_end + 4095) &
-                                        0xfffffffffffff000);
-        }
 }
 
 static int __init iSeries_src_init(void)
@@ -683,6 +666,8 @@ static int __init iseries_probe(void)
          */
         virt_irq_max = 255;
 
+        hpte_init_iSeries();
+
         return 1;
 }