[PATCH] powerpc: Remove unused iommu_off logic from pSeries_init_early()

When iommu_init_early_pSeries() was added, ages ago, we forgot to remove
the code that checks /chosen/linux,iommu-off in pSeries_init_early(). We
do it now in iommu_init_early_pSeries().

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index b5996a7060f43d52c3bbd85a1861431bf756507d..149751a3742a725eabb23f2dc882b572233d31e6 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -320,19 +320,14 @@ static int pseries_set_xdabr(unsigned long dabr)
  */
 static void __init pSeries_init_early(void)
 {
-       int iommu_off = 0;
-
        DBG(" -> pSeries_init_early()\n");
 
        fw_feature_init();
        
        if (platform_is_lpar())
                hpte_init_lpar();
-       else {
+       else
                hpte_init_native();
-               iommu_off = (of_chosen &&
-                            get_property(of_chosen, "linux,iommu-off", NULL));
-       }
 
        if (platform_is_lpar())
                find_udbg_vterm();