---

yaml --- r: 321443 b: refs/heads/master c: 1adb7d3 h: refs/heads/master i: 321441: a72dd72 321439: 74c2f87 v: v3
git-mirror · Aug 6, 2012 · aa68797 · aa68797
1 parent a8e92d6
commit aa68797
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb51637b6ec73ff5f8eaca57658a9945aa7bd45f
+refs/heads/master: 1adb7d31b051cd97fbb75c46772b00c13ec29c9e
diff --git a/trunk/drivers/iommu/amd_iommu_init.c b/trunk/drivers/iommu/amd_iommu_init.c
@@ -1131,9 +1131,6 @@ static int __init amd_iommu_init_pci(void)
 			break;
 	}
 
-	/* Make sure ACS will be enabled */
-	pci_request_acs();
-
 	ret = amd_iommu_init_devices();
 
 	print_iommu_info();
@@ -1652,6 +1649,9 @@ static bool detect_ivrs(void)
 
 	early_acpi_os_unmap_memory((char __iomem *)ivrs_base, ivrs_size);
 
+	/* Make sure ACS will be enabled during PCI probe */
+	pci_request_acs();
+
 	return true;
 }