From af56e4b98b92a7298a548b06d7eefabd80c4b3b4 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 26 Aug 2010 13:58:01 -0400
Subject: [PATCH] --- yaml --- r: 212239 b: refs/heads/master c:
 5cb3a267939a223eb84692d229569d2ef493d7ca h: refs/heads/master i:   212237:
 7f8e34b5fdab95a84707c578483fd4d72c5b41ca   212235:
 838ef670b87ef3128ffbdc3f64d93c4b03df6b05   212231:
 7b3c4a2bb5923a260a594e45ee89f79ff13e6630   212223:
 c6deadd8afdc6059517e2b09f13e18c2a4291215 v: v3

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

diff --git a/[refs] b/[refs]
index 604ec7f7d469..a74bcbf7691f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c116c5457c46edb767df6f4e36d4905e3514ad37
+refs/heads/master: 5cb3a267939a223eb84692d229569d2ef493d7ca
diff --git a/trunk/arch/x86/xen/pci-swiotlb-xen.c b/trunk/arch/x86/xen/pci-swiotlb-xen.c
index a013ec9d0c54..22471001b74c 100644
--- a/trunk/arch/x86/xen/pci-swiotlb-xen.c
+++ b/trunk/arch/x86/xen/pci-swiotlb-xen.c
@@ -5,6 +5,7 @@
 
 #include <asm/xen/hypervisor.h>
 #include <xen/xen.h>
+#include <asm/iommu_table.h>
 
 int xen_swiotlb __read_mostly;
 
@@ -56,3 +57,7 @@ void __init pci_xen_swiotlb_init(void)
 		dma_ops = &xen_swiotlb_dma_ops;
 	}
 }
+IOMMU_INIT_FINISH(pci_xen_swiotlb_detect,
+		  0,
+		  pci_xen_swiotlb_init,
+		  0);