From 340174e010aeb3a95b8b9e26d26213de0c721abe Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 13 Aug 2009 18:18:00 +0100
Subject: [PATCH] --- yaml --- r: 165420 b: refs/heads/master c:
 ba6c548701ef7a93b9ea05d1506d2b62f1628333 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/kernel/pci-swiotlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6429fca0e4a3..a5bb8254ab9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fe60f4e5871b64e687229199fafd4ef13cd0886
+refs/heads/master: ba6c548701ef7a93b9ea05d1506d2b62f1628333
diff --git a/trunk/arch/ia64/kernel/pci-swiotlb.c b/trunk/arch/ia64/kernel/pci-swiotlb.c
index 223abb134105..285aae8431c6 100644
--- a/trunk/arch/ia64/kernel/pci-swiotlb.c
+++ b/trunk/arch/ia64/kernel/pci-swiotlb.c
@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void)
 
 void __init pci_swiotlb_init(void)
 {
-	if (!iommu_detected || iommu_pass_through) {
+	if (!iommu_detected) {
 #ifdef CONFIG_IA64_GENERIC
 		swiotlb = 1;
 		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");