From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 22 Sep 2009 07:04:07 +0000 (+0100)
Subject: xen/usb: force proper address translation in USB monitor
X-Git-Tag: xen-3.4.2~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=77496bb82ea767427952c3578db56274a7c30964;p=legacy%2Flinux-2.6.18-xen.git

xen/usb: force proper address translation in USB monitor

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/drivers/usb/mon/mon_dma.c b/drivers/usb/mon/mon_dma.c
index ddcfc01e..8011967c 100644
--- a/drivers/usb/mon/mon_dma.c
+++ b/drivers/usb/mon/mon_dma.c
@@ -19,7 +19,11 @@
 #if defined(__i386__) || defined(__x86_64__) /* CONFIG_ARCH_I386 doesn't exit */
 #define MON_HAS_UNMAP 1
 
+#ifndef CONFIG_XEN
 #define phys_to_page(phys)	pfn_to_page((phys) >> PAGE_SHIFT)
+#else
+#define phys_to_page(phys)	pfn_to_page(mfn_to_local_pfn((phys) >> PAGE_SHIFT))
+#endif
 
 char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len)
 {