[Xen-changelog] [linux-2.6.18-xen] linux/x86-64: again pte_val() -> __pte_val()

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1223992646 -3600
# Node ID 70fb735a8e2847d0365952bd7ce0debee6c1a9d7
# Parent  9c0f24bdbe3ac5febe582c0bd068d517709fc7ed
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@xxxxxxxxxx>
---
 arch/x86_64/mm/init-xen.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 9c0f24bdbe3a -r 70fb735a8e28 arch/x86_64/mm/init-xen.c
--- a/arch/x86_64/mm/init-xen.c Fri Oct 10 10:17:40 2008 +0100
+++ b/arch/x86_64/mm/init-xen.c Tue Oct 14 14:57:26 2008 +0100
@@ -274,7 +274,7 @@ static __init void set_pte_phys(unsigned
                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 @@ static __init void set_pte_phys_ma(unsig
        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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog