From aa68797c04936b11995da150493e9a07217d0e9e Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 6 Aug 2012 14:18:42 +0200
Subject: [PATCH] --- yaml --- r: 321443 b: refs/heads/master c:
 1adb7d31b051cd97fbb75c46772b00c13ec29c9e h: refs/heads/master i:   321441:
 a72dd7224ec44d4744e1f8aa2303530629de4c60   321439:
 74c2f87194c39c0ce325c89a5317834f6714a5bb v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/iommu/amd_iommu_init.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f013ac7c081..19c0f54f34f1 100644
--- 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
index 500e7f15f5c2..0a2ea317120a 100644
--- 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;
 }