|  |  | 
  
    |  |  | 
 
  |   |  | 
  
    |  |  | 
  
    |  |  | 
  
    |   xen-devel
[Xen-devel] [PATCH 13/24] Xen: Add virt_to_pfn helper function 
| From: Alex Nixon <alex.nixon@xxxxxxxxxx>
Signed-off-by: Alex Nixon <alex.nixon@xxxxxxxxxx>
---
 arch/x86/include/asm/xen/page.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 1a918dd..018a0a4 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -124,7 +124,8 @@ static inline unsigned long mfn_to_local_pfn(unsigned long 
mfn)
 
 /* VIRT <-> MACHINE conversion */
 #define virt_to_machine(v)     (phys_to_machine(XPADDR(__pa(v))))
-#define virt_to_mfn(v)         (pfn_to_mfn(PFN_DOWN(__pa(v))))
+#define virt_to_pfn(v)          (PFN_DOWN(__pa(v)))
+#define virt_to_mfn(v)         (pfn_to_mfn(virt_to_pfn(v)))
 #define mfn_to_virt(m)         (__va(mfn_to_pfn(m) << PAGE_SHIFT))
 
 static inline unsigned long pte_mfn(pte_t pte)
-- 
1.6.0.6
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
 | 
 
| <Prev in Thread] | Current Thread | [Next in Thread> |  | 
[Xen-devel] [PATCH 13/24] Xen: Add virt_to_pfn helper function,
Jeremy Fitzhardinge <=
[Xen-devel] [PATCH 11/24] xen: add FIX_TEXT_POKE to fixmap, Jeremy Fitzhardinge
[Xen-devel] [PATCH 14/24] xen: add irq_from_evtchn, Jeremy Fitzhardinge
[Xen-devel] [PATCH 18/24] xen: add "capabilities" file, Jeremy Fitzhardinge
[Xen-devel] [PATCH 17/24] xen/dev-evtchn: clean up locking in evtchn, Jeremy Fitzhardinge
[Xen-devel] [PATCH 16/24] xen: export ioctl headers to userspace, Jeremy Fitzhardinge
[Xen-devel] [PATCH 15/24] xen: add /dev/xen/evtchn driver, Jeremy Fitzhardinge
[Xen-devel] [PATCH 21/24] xen: drop kexec bits from /sys/hypervisor	since kexec isn't implemented yet, Jeremy Fitzhardinge
[Xen-devel] [PATCH 20/24] xen/sys/hypervisor: change writable_pt to	features, Jeremy Fitzhardinge
[Xen-devel] [PATCH 19/24] xen: add /sys/hypervisor support, Jeremy Fitzhardinge
[Xen-devel] [PATCH 24/24] xen/xenbus: export xenbus_dev_changed, Jeremy Fitzhardinge[Xen-devel] [PATCH 08/24] xen: reserve i386 Xen pagetables, (continued)
 |  |  | 
  
    |  |  |