ia64/xen-unstable

changeset 4893:13eda43dda49

bitkeeper revision 1.1389.1.55 (4283d2abTQukZce4qzwxx1FWqaoLXQ)

page.h, init.c:
phys is machine physical already. So we shouldn't try to convert guest
physical to machine physical.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu May 12 22:03:23 2005 +0000 (2005-05-12)
parents 1d1a0adf4c90
children 451693d20478
files linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c	Thu May 12 22:02:35 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c	Thu May 12 22:03:23 2005 +0000
     1.3 @@ -328,11 +328,11 @@ static void set_pte_phys_ma(unsigned lon
     1.4  		}
     1.5  	}
     1.6  
     1.7 -	new_pte = pfn_pte(phys >> PAGE_SHIFT, prot);
     1.8 +	new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot);
     1.9  	pte = pte_offset_kernel(pmd, vaddr);
    1.10  
    1.11  	if (!pte_none(*pte) &&
    1.12 -	    pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
    1.13 +	    pte_val_ma(*pte) != (pte_val_ma(new_pte) & __supported_pte_mask))
    1.14  		pte_ERROR(*pte);
    1.15  
    1.16          /* 
     2.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h	Thu May 12 22:02:35 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h	Thu May 12 22:03:23 2005 +0000
     2.3 @@ -92,6 +92,7 @@ typedef struct { unsigned long pgprot; }
     2.4  
     2.5  #define pte_val(x)	(((x).pte & 1) ? machine_to_phys((x).pte) : \
     2.6  			 (x).pte)
     2.7 +#define pte_val_ma(x)	((x).pte)
     2.8  
     2.9  static inline unsigned long pmd_val(pmd_t x)
    2.10  {