1.1 --- a/xen/include/asm-ia64/linux-xen/asm/page.h	Fri Oct 17 18:16:05 2008 +0900
     1.2 +++ b/xen/include/asm-ia64/linux-xen/asm/page.h	Fri Oct 17 18:24:57 2008 +0900
     1.3 @@ -99,6 +99,7 @@ do {						\
     1.4  
     1.5  #define virt_addr_valid(kaddr)	mfn_valid(__pa(kaddr) >> PAGE_SHIFT)
     1.6  
     1.7 +#ifndef XEN
     1.8  #ifdef CONFIG_VIRTUAL_MEM_MAP
     1.9  extern int ia64_mfn_valid (unsigned long pfn);
    1.10  #else
    1.11 @@ -119,6 +120,7 @@ extern unsigned long max_low_pfn;
    1.12  
    1.13  #define page_to_maddr(page)	(page_to_mfn(page) << PAGE_SHIFT)
    1.14  #define virt_to_page(kaddr)	mfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
    1.15 +#endif
    1.16  
    1.17  typedef union ia64_va {
    1.18  	struct {

     2.1 --- a/xen/include/asm-ia64/xenpage.h	Fri Oct 17 18:16:05 2008 +0900
     2.2 +++ b/xen/include/asm-ia64/xenpage.h	Fri Oct 17 18:24:57 2008 +0900
     2.3 @@ -5,11 +5,7 @@
     2.4  #define IA64_MAX_PHYS_BITS	50	/* max. number of physical address bits (architected) */
     2.5  
     2.6  #ifndef __ASSEMBLY__
     2.7 -#undef mfn_valid
     2.8 -#undef page_to_mfn
     2.9 -#undef mfn_to_page
    2.10  #ifdef CONFIG_VIRTUAL_FRAME_TABLE
    2.11 -#undef ia64_mfn_valid
    2.12  extern int ia64_mfn_valid (unsigned long pfn);
    2.13  # define mfn_valid(_pfn)	(((_pfn) < max_page) && ia64_mfn_valid(_pfn))
    2.14  #else
    2.15 @@ -37,8 +33,6 @@ static inline unsigned long __virt_to_ma
    2.16  #define virt_to_maddr(va)	(__virt_to_maddr((unsigned long)va))
    2.17  
    2.18  
    2.19 -#undef page_to_maddr
    2.20 -#undef virt_to_page
    2.21  #define page_to_maddr(page)	(page_to_mfn(page) << PAGE_SHIFT)
    2.22  #define virt_to_page(kaddr)	(mfn_to_page(virt_to_maddr(kaddr) >> PAGE_SHIFT))
    2.23  
    2.24 @@ -97,8 +91,6 @@ static inline u64 pa_clear_uc(u64 paddr)
    2.25      return (paddr << 1) >> 1;
    2.26  }
    2.27  
    2.28 -#undef __pa
    2.29 -#undef __va
    2.30  #define __pa(x)		(virt_to_maddr(x))
    2.31  #define __va(x)		({xen_va _v; _v.l = (long) (x); _v.f.reg = -1; _v.p;})
    2.32