aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2006-03-21 04:45:58 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-21 23:04:12 -0500
commit415202447d31d0f458cca256ad7e0ed777d993d9 (patch)
tree3f12c25557a7f631852e2bda9831dc7fc9b5b5fc
parentcaf80e579b5fc0048681a47c5a55487116e56a88 (diff)
[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>
-rw-r--r--arch/powerpc/platforms/pseries/setup.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index b5996a7060f4..149751a3742a 100644
--- 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)
320 */ 320 */
321static void __init pSeries_init_early(void) 321static void __init pSeries_init_early(void)
322{ 322{
323 int iommu_off = 0;
324
325 DBG(" -> pSeries_init_early()\n"); 323 DBG(" -> pSeries_init_early()\n");
326 324
327 fw_feature_init(); 325 fw_feature_init();
328 326
329 if (platform_is_lpar()) 327 if (platform_is_lpar())
330 hpte_init_lpar(); 328 hpte_init_lpar();
331 else { 329 else
332 hpte_init_native(); 330 hpte_init_native();
333 iommu_off = (of_chosen &&
334 get_property(of_chosen, "linux,iommu-off", NULL));
335 }
336 331
337 if (platform_is_lpar()) 332 if (platform_is_lpar())
338 find_udbg_vterm(); 333 find_udbg_vterm();