[Xen-devel] [PATCH] linux/x86-64: again pte_val() -> __pte_val()

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

... as the generated code is so much easier to read (performance doesn't
really matter here).

As usual, written and tested on 2.6.27 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- head-2008-10-13.orig/arch/x86_64/mm/init-xen.c
+++ head-2008-10-13/arch/x86_64/mm/init-xen.c
@@ -274,7 +274,7 @@
                new_pte = __pte(0);
 
        pte = pte_offset_kernel(pmd, vaddr);
-       if (!pte_none(*pte) && pte_val(new_pte) &&
+       if (!pte_none(*pte) && __pte_val(new_pte) &&
            __pte_val(*pte) != (__pte_val(new_pte) & __supported_pte_mask))
                pte_ERROR(*pte);
        set_pte(pte, new_pte);
@@ -325,7 +325,7 @@
        new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot);
 
        pte = pte_offset_kernel(pmd, vaddr);
-       if (!pte_none(*pte) && pte_val(new_pte) &&
+       if (!pte_none(*pte) && __pte_val(new_pte) &&
 #ifdef CONFIG_ACPI
            /* __acpi_map_table() fails to properly call clear_fixmap() */
            (vaddr < __fix_to_virt(FIX_ACPI_END) ||




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel