X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-x86%2Fxen%2Fpage.h;h=05e678a86628b5a7c53563f766eeb57652ed4014;hb=e66d90fb4abd0a27ee96f57a32fb561221c4d6ae;hp=377c04591c15e7b7d7a2584a176e6d2cb4d8bb77;hpb=520b9617ab4aea764ddfc5d58cae21c16b3318e1;p=linux-2.6

diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h
index 377c04591c..05e678a866 100644
--- a/include/asm-x86/xen/page.h
+++ b/include/asm-x86/xen/page.h
@@ -148,13 +148,17 @@ static inline pte_t __pte_ma(pteval_t x)
 }
 
 #define pmd_val_ma(v) ((v).pmd)
+#ifdef __PAGETABLE_PUD_FOLDED
 #define pud_val_ma(v) ((v).pgd.pgd)
+#else
+#define pud_val_ma(v) ((v).pud)
+#endif
 #define __pmd_ma(x)	((pmd_t) { (x) } )
 
 #define pgd_val_ma(x)	((x).pgd)
 
 
-xmaddr_t arbitrary_virt_to_machine(unsigned long address);
+xmaddr_t arbitrary_virt_to_machine(void *address);
 void make_lowmem_page_readonly(void *vaddr);
 void make_lowmem_page_readwrite(void *vaddr);