ia64/linux-2.6.18-xen.hg

changeset 623:d25b46565529

linux/x86-64: (re-)add warning to set_pte_phys_ma()

.. as a similar one exists in set_pte_phys() (and also in native).


Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Jul 23 14:21:58 2008 +0100 (2008-07-23)
parents 2b60a0b5432e
children 57ccd252e855
files arch/x86_64/mm/init-xen.c
line diff
     1.1 --- a/arch/x86_64/mm/init-xen.c	Wed Jul 23 14:21:16 2008 +0100
     1.2 +++ b/arch/x86_64/mm/init-xen.c	Wed Jul 23 14:21:58 2008 +0100
     1.3 @@ -325,6 +325,14 @@ static __init void set_pte_phys_ma(unsig
     1.4  	new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot);
     1.5  
     1.6  	pte = pte_offset_kernel(pmd, vaddr);
     1.7 +	if (!pte_none(*pte) &&
     1.8 +#ifdef CONFIG_ACPI
     1.9 +	    /* __acpi_map_table() fails to properly call clear_fixmap() */
    1.10 +	    (vaddr < __fix_to_virt(FIX_ACPI_END) ||
    1.11 +	     vaddr > __fix_to_virt(FIX_ACPI_BEGIN)) &&
    1.12 +#endif
    1.13 +	    __pte_val(*pte) != (__pte_val(new_pte) & __supported_pte_mask))
    1.14 +		pte_ERROR(*pte);
    1.15  	set_pte(pte, new_pte);
    1.16  
    1.17  	/*