From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 3 Sep 2009 23:24:14 +0000 (-0700)
Subject: xen/swiotlb: fix i386 compilation
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=27a3a522df14568002c73b4d233c7c86d4b69a2d;p=people%2Fssmith%2Fnetchannel2-pvops.git

xen/swiotlb: fix i386 compilation

i386 dma_release_from_coherent() uses its arguments, and dev!=hwdev.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
index d9733577ec9..19b78e2894b 100644
--- a/arch/x86/xen/pci-swiotlb.c
+++ b/arch/x86/xen/pci-swiotlb.c
@@ -612,7 +612,7 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
 {
 	int order = get_order(size);
 
-	if (dma_release_from_coherent(dev, order, vaddr))
+	if (dma_release_from_coherent(hwdev, order, vaddr))
 		return;
 
 	xen_destroy_contiguous_region((unsigned long)vaddr, order);