diff -r bea505a69722 xen/include/asm-x86/page.h
--- a/xen/include/asm-x86/page.h	Tue Jan 23 15:58:05 2007 +0000
+++ b/xen/include/asm-x86/page.h	Wed Jan 24 09:32:26 2007 +0100
@@ -222,7 +222,7 @@ typedef struct { u64 pfn; } pagetable_t;
 
 /* Convert between Xen-heap virtual addresses and machine addresses. */
 #define PAGE_OFFSET         ((unsigned long)__PAGE_OFFSET)
-#define virt_to_maddr(va)   ((unsigned long)(va)-PAGE_OFFSET)
+#define virt_to_maddr(va)   ((paddr_t)(va)-PAGE_OFFSET)
 #define maddr_to_virt(ma)   ((void *)((unsigned long)(ma)+PAGE_OFFSET))
 /* Shorthand versions of the above functions. */
 #define __pa(x)             (virt_to_maddr(x))