From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 16 Sep 2009 22:16:30 +0000 (-0700)
Subject: xen/swiotlb: don't double initialize swiotlb
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f45589b7af11512dce413b086ca8c1cbdbf7d15a;p=people%2Fssmith%2Fnetchannel2-pvops.git

xen/swiotlb: don't double initialize swiotlb

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 61549694868..e7ee2fdc023 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -281,8 +281,6 @@ static int __init pci_iommu_init(void)
 
 	xen_iommu_init();
 
-	xen_swiotlb_init();
-
 	calgary_iommu_init();
 
 	intel_iommu_init();