---

yaml --- r: 158085 b: refs/heads/master c: 4751a95 h: refs/heads/master i: 158083: 99fdba1 v: v3
git-mirror · Sep 3, 2009 · e4a0a28 · e4a0a28
1 parent 2038b07
commit e4a0a28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1ca331c8aa75cd58fdf685e2e8745e1d3ec5c8f
+refs/heads/master: 4751a95134e05f1172131d2001c6991d671fa58c
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -1242,12 +1242,18 @@ int __init amd_iommu_init(void)
 	if (ret)
 		goto free;
 
-	ret = amd_iommu_init_dma_ops();
+	if (iommu_pass_through)
+		ret = amd_iommu_init_passthrough();
+	else
+		ret = amd_iommu_init_dma_ops();
 	if (ret)
 		goto free;
 
 	enable_iommus();
 
+	if (iommu_pass_through)
+		goto out;
+
 	printk(KERN_INFO "AMD IOMMU: device isolation ");
 	if (amd_iommu_isolate)
 		printk("enabled\n");