From e4b7f43194eb706383a9ba52da93bc27e1fe6a45 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 5 Dec 2005 14:19:10 +1100
Subject: [PATCH] --- yaml --- r: 14978 b: refs/heads/master c:
 6fbb618f5da0424adcba5f666035e4772a8df526 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d09e2fcf6d86..a6734593a0b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a167accb47de528d2ffddc0f13f8e84eaa71de
+refs/heads/master: 6fbb618f5da0424adcba5f666035e4772a8df526
diff --git a/trunk/arch/powerpc/platforms/pseries/iommu.c b/trunk/arch/powerpc/platforms/pseries/iommu.c
index fa1edbdcf88c..2043659ea7b1 100644
--- a/trunk/arch/powerpc/platforms/pseries/iommu.c
+++ b/trunk/arch/powerpc/platforms/pseries/iommu.c
@@ -146,7 +146,7 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
 	union tce_entry tce, *tcep;
 	long l, limit;
 
-	if (npages == 1)
+	if (TCE_PAGE_FACTOR == 0 && npages == 1)
 		return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
 					   direction);