From 7ff6abf84e59594cd2ba5d879c08e2c5db4dd219 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Tue, 21 Mar 2006 20:45:58 +1100
Subject: [PATCH] --- yaml --- r: 22956 b: refs/heads/master c:
 415202447d31d0f458cca256ad7e0ed777d993d9 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/pseries/setup.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0f7f836dd957..b6fe704079d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf80e579b5fc0048681a47c5a55487116e56a88
+refs/heads/master: 415202447d31d0f458cca256ad7e0ed777d993d9
diff --git a/trunk/arch/powerpc/platforms/pseries/setup.c b/trunk/arch/powerpc/platforms/pseries/setup.c
index b5996a7060f4..149751a3742a 100644
--- a/trunk/arch/powerpc/platforms/pseries/setup.c
+++ b/trunk/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();