From aac5263f1605c73b5352aa6e0f0ef904eee87878 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 26 Jun 2008 21:28:08 +0200
Subject: [PATCH] --- yaml --- r: 99631 b: refs/heads/master c:
 a69ca3401821b7312cb7ec939a8814240fd7b9b3 h: refs/heads/master i:   99629:
 63ad62cdcad4c7bb4a4df3dfe4e6ded9db8a4de2   99627:
 8a5016f99c167fe177dcc2d830cbee4ee551566e   99623:
 e10fb9630b2cd4c0a5c72ea194193479055ef888   99615:
 c0328733a0cb3d5cd72db8cff94ac8ce00658e4a v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/pci-dma.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0bd4f617bde8..f1db5aedb3e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8736197ba8e40d030eec0ab7a9e9f2be41810c4e
+refs/heads/master: a69ca3401821b7312cb7ec939a8814240fd7b9b3
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index dc00a1331ace..dea01672f1f4 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -7,6 +7,7 @@
 #include <asm/dma.h>
 #include <asm/gart.h>
 #include <asm/calgary.h>
+#include <asm/amd_iommu.h>
 
 int forbid_dac __read_mostly;
 EXPORT_SYMBOL(forbid_dac);
@@ -122,6 +123,8 @@ void __init pci_iommu_alloc(void)
 
 	detect_intel_iommu();
 
+	amd_iommu_detect();
+
 #ifdef CONFIG_SWIOTLB
 	pci_swiotlb_init();
 #endif
@@ -502,6 +505,8 @@ static int __init pci_iommu_init(void)
 
 	intel_iommu_init();
 
+	amd_iommu_init();
+
 #ifdef CONFIG_GART_IOMMU
 	gart_iommu_init();
 #endif