From 0be4dec7dc4e5e3efdfeed08abfe76a76329c9a9 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <kliw@darnok.org>
Date: Mon, 31 Aug 2009 15:32:13 -0400
Subject: [PATCH] Enable Xen-SWIOTLB to be part of bootup process.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
 arch/x86/kernel/pci-dma.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index e486c403053..eca588b433a 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -11,6 +11,7 @@
 #include <asm/calgary.h>
 #include <asm/amd_iommu.h>
 #include <asm/xen/iommu.h>
+#include <asm/xen/swiotlb.h>
 
 static int forbid_dac __read_mostly;
 
@@ -127,6 +128,8 @@ void __init pci_iommu_alloc(void)
 
 	amd_iommu_detect();
 
+	xen_swiotlb_init_alloc();
+
 	pci_swiotlb_init();
 }
 
@@ -278,6 +281,8 @@ static int __init pci_iommu_init(void)
 
 	xen_iommu_init();
 
+	xen_swiotlb_init();
+
 	calgary_iommu_init();
 
 	intel_iommu_init();
-- 
2.39.5