---

yaml --- r: 165420 b: refs/heads/master c: ba6c548 h: refs/heads/master v: v3
git-mirror · Aug 13, 2009 · 340174e · 340174e
1 parent 15e844b
commit 340174e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");