ia64/linux-2.6.18-xen.hg

changeset 700:70fb735a8e28

linux/x86-64: again pte_val() -> __pte_val()
... as the generated code is so much easier to read (performance
doesn't really matter here).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Oct 14 14:57:26 2008 +0100 (2008-10-14)
parents 9c0f24bdbe3a
children 16c549b3ba59
files arch/x86_64/mm/init-xen.c
line diff
     1.1 --- a/arch/x86_64/mm/init-xen.c	Fri Oct 10 10:17:40 2008 +0100
     1.2 +++ b/arch/x86_64/mm/init-xen.c	Tue Oct 14 14:57:26 2008 +0100
     1.3 @@ -274,7 +274,7 @@ static __init void set_pte_phys(unsigned
     1.4  		new_pte = __pte(0);
     1.5  
     1.6  	pte = pte_offset_kernel(pmd, vaddr);
     1.7 -	if (!pte_none(*pte) && pte_val(new_pte) &&
     1.8 +	if (!pte_none(*pte) && __pte_val(new_pte) &&
     1.9  	    __pte_val(*pte) != (__pte_val(new_pte) & __supported_pte_mask))
    1.10  		pte_ERROR(*pte);
    1.11  	set_pte(pte, new_pte);
    1.12 @@ -325,7 +325,7 @@ static __init void set_pte_phys_ma(unsig
    1.13  	new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot);
    1.14  
    1.15  	pte = pte_offset_kernel(pmd, vaddr);
    1.16 -	if (!pte_none(*pte) && pte_val(new_pte) &&
    1.17 +	if (!pte_none(*pte) && __pte_val(new_pte) &&
    1.18  #ifdef CONFIG_ACPI
    1.19  	    /* __acpi_map_table() fails to properly call clear_fixmap() */
    1.20  	    (vaddr < __fix_to_virt(FIX_ACPI_END) ||