From: Keir Fraser <keir@xensource.com>
Date: Thu, 25 Oct 2007 15:07:39 +0000 (+0100)
Subject: linux: more users of __pte_val/__p[mug]d_val
X-Git-Tag: xen-3.2.0~21^2^2~28^2^2~22^2^2~9^2~12^2~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ee97382d45a0f96d6435151ad04923b377860eb1;p=xenclient%2Fkernel.git

linux: more users of __pte_val/__p[mug]d_val

Use __pXX_val() instead of pXX_val() when only flags are accessed.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/arch/i386/mm/fault-xen.c b/arch/i386/mm/fault-xen.c
index 4ff20941..97f5a5a5 100644
--- a/arch/i386/mm/fault-xen.c
+++ b/arch/i386/mm/fault-xen.c
@@ -346,7 +346,7 @@ static int spurious_fault(struct pt_regs *regs,
 	if ((error_code & 0x02) && !pte_write(*pte))
 		return 0;
 #ifdef CONFIG_X86_PAE
-	if ((error_code & 0x10) && (pte_val(*pte) & _PAGE_NX))
+	if ((error_code & 0x10) && (__pte_val(*pte) & _PAGE_NX))
 		return 0;
 #endif
 
diff --git a/arch/x86_64/mm/fault-xen.c b/arch/x86_64/mm/fault-xen.c
index 5c832c8b..7a12f4a5 100644
--- a/arch/x86_64/mm/fault-xen.c
+++ b/arch/x86_64/mm/fault-xen.c
@@ -380,7 +380,7 @@ static int spurious_fault(struct pt_regs *regs,
 		return 0;
 	if ((error_code & PF_WRITE) && !pte_write(*pte))
 		return 0;
-	if ((error_code & PF_INSTR) && (pte_val(*pte) & _PAGE_NX))
+	if ((error_code & PF_INSTR) && (__pte_val(*pte) & _PAGE_NX))
 		return 0;
 
 	return 1;
diff --git a/arch/x86_64/mm/init-xen.c b/arch/x86_64/mm/init-xen.c
index 20d4a745..d9650188 100644
--- a/arch/x86_64/mm/init-xen.c
+++ b/arch/x86_64/mm/init-xen.c
@@ -272,7 +272,7 @@ static __init void set_pte_phys(unsigned long vaddr,
 
 	pte = pte_offset_kernel(pmd, vaddr);
 	if (!pte_none(*pte) &&
-	    pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
+	    __pte_val(*pte) != (__pte_val(new_pte) & __supported_pte_mask))
 		pte_ERROR(*pte);
 	set_pte(pte, new_pte);
 
@@ -868,7 +868,7 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)
 		pmd = pmd_offset(pud, address);
 		if (!pmd || pmd_none(*pmd))
 			continue; 
-		if (0 == (pmd_val(*pmd) & _PAGE_PSE)) { 
+		if (0 == (__pmd_val(*pmd) & _PAGE_PSE)) {
 			/* Could handle this, but it should not happen currently. */
 			printk(KERN_ERR 
 	       "clear_kernel_mapping: mapping has been split. will leak memory\n"); 
diff --git a/arch/x86_64/mm/pageattr-xen.c b/arch/x86_64/mm/pageattr-xen.c
index 6597b48c..ff1d7b4c 100644
--- a/arch/x86_64/mm/pageattr-xen.c
+++ b/arch/x86_64/mm/pageattr-xen.c
@@ -370,7 +370,7 @@ static void revert_page(unsigned long address, pgprot_t ref_prot)
 	pud = pud_offset(pgd,address);
 	BUG_ON(pud_none(*pud));
 	pmd = pmd_offset(pud, address);
-	BUG_ON(pmd_val(*pmd) & _PAGE_PSE);
+	BUG_ON(__pmd_val(*pmd) & _PAGE_PSE);
 	pgprot_val(ref_prot) |= _PAGE_PSE;
 	large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);
 	set_pte((pte_t *)pmd, large_pte);
diff --git a/include/asm-x86_64/mach-xen/asm/pgtable.h b/include/asm-x86_64/mach-xen/asm/pgtable.h
index 6ab63dbc..86b51cb7 100644
--- a/include/asm-x86_64/mach-xen/asm/pgtable.h
+++ b/include/asm-x86_64/mach-xen/asm/pgtable.h
@@ -505,7 +505,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define __swp_type(x)			(((x).val >> 1) & 0x3f)
 #define __swp_offset(x)			((x).val >> 8)
 #define __swp_entry(type, offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
-#define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) })
+#define __pte_to_swp_entry(pte)		((swp_entry_t) { __pte_val(pte) })
 #define __swp_entry_to_pte(x)		((pte_t) { (x).val })
 
 extern spinlock_t pgd_lock;