---

yaml --- r: 99614 b: refs/heads/master c: ae7877d h: refs/heads/master v: v3
git-mirror · Jun 27, 2008 · 133a1ce · 133a1ce
1 parent 059564b
commit 133a1ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe74c9cf3985e307e9734296d08a270d510e3fb7
+refs/heads/master: ae7877de9cd8da075a46d5f615cb9fc9858e4b2f
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -769,3 +769,23 @@ int __init amd_iommu_init(void)
 	goto out;
 }
 
+static int __init early_amd_iommu_detect(struct acpi_table_header *table)
+{
+	return 0;
+}
+
+void __init amd_iommu_detect(void)
+{
+	if (swiotlb || no_iommu || iommu_detected)
+		return;
+
+	if (amd_iommu_disable)
+		return;
+
+	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
+		iommu_detected = 1;
+		gart_iommu_aperture_disabled = 1;
+		gart_iommu_aperture = 0;
+	}
+}
+