1.1 --- a/xen/include/asm-ia64/mm.h	Thu Aug 31 19:53:27 2006 +0100
     1.2 +++ b/xen/include/asm-ia64/mm.h	Thu Aug 31 22:29:23 2006 +0100
     1.3 @@ -451,7 +451,6 @@ extern u64 translate_domain_pte(u64 ptev
     1.4  
     1.5  #define INVALID_M2P_ENTRY        (~0UL)
     1.6  #define VALID_M2P(_e)            (!((_e) & (1UL<<63)))
     1.7 -#define IS_INVALID_M2P_ENTRY(_e) (!VALID_M2P(_e))
     1.8  
     1.9  #define set_gpfn_from_mfn(mfn, pfn) (machine_to_phys_mapping[(mfn)] = (pfn))
    1.10  #define get_gpfn_from_mfn(mfn)      (machine_to_phys_mapping[(mfn)])

     2.1 --- a/xen/include/asm-x86/mm.h	Thu Aug 31 19:53:27 2006 +0100
     2.2 +++ b/xen/include/asm-x86/mm.h	Thu Aug 31 22:29:23 2006 +0100
     2.3 @@ -338,7 +338,6 @@ int check_descriptor(struct desc_struct 
     2.4  #define machine_to_phys_mapping  ((unsigned long *)RDWR_MPT_VIRT_START)
     2.5  #define INVALID_M2P_ENTRY        (~0UL)
     2.6  #define VALID_M2P(_e)            (!((_e) & (1UL<<(BITS_PER_LONG-1))))
     2.7 -#define IS_INVALID_M2P_ENTRY(_e) (!VALID_M2P(_e))
     2.8  
     2.9  #define set_gpfn_from_mfn(mfn, pfn) (machine_to_phys_mapping[(mfn)] = (pfn))
    2.10  #define get_gpfn_from_mfn(mfn)      (machine_to_phys_mapping[(mfn)])