1.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c	Tue Sep 20 13:07:10 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c	Tue Sep 20 14:09:07 2005 +0000
     1.3 @@ -36,13 +36,12 @@ struct ring_head
     1.4  
     1.5  static inline struct ring_head *outring(void)
     1.6  {
     1.7 -	return machine_to_virt(xen_start_info->console_mfn << PAGE_SHIFT);
     1.8 +	return mfn_to_virt(xen_start_info->console_mfn);
     1.9  }
    1.10  
    1.11  static inline struct ring_head *inring(void)
    1.12  {
    1.13 -	return machine_to_virt(xen_start_info->console_mfn << PAGE_SHIFT)
    1.14 -		+ PAGE_SIZE/2;
    1.15 +	return mfn_to_virt(xen_start_info->console_mfn) + PAGE_SIZE/2;
    1.16  }
    1.17  
    1.18  

     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h	Tue Sep 20 13:07:10 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h	Tue Sep 20 14:09:07 2005 +0000
     2.3 @@ -261,7 +261,6 @@ extern int sysctl_legacy_va_layout;
     2.4  
     2.5  /* VIRT <-> MACHINE conversion */
     2.6  #define virt_to_machine(v)	(phys_to_machine(__pa(v)))
     2.7 -#define machine_to_virt(m)	(__va(machine_to_phys(m)))
     2.8  #define virt_to_mfn(v)		(pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
     2.9  #define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))
    2.10  

     3.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h	Tue Sep 20 13:07:10 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h	Tue Sep 20 14:09:07 2005 +0000
     3.3 @@ -239,7 +239,6 @@ extern __inline__ int get_order(unsigned
     3.4  
     3.5  /* VIRT <-> MACHINE conversion */
     3.6  #define virt_to_machine(v)	(phys_to_machine(__pa(v)))
     3.7 -#define machine_to_virt(m)	(__va(machine_to_phys(m)))
     3.8  #define virt_to_mfn(v)		(pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
     3.9  #define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))
    3.10