x86/pvops: remove pte_flags pvop

pte_flags() was introduced as a new pvop in order to extract just the
flags portion of a pte, which is a potentially cheaper operation than
extracting the page number as well.  It turns out this operation is
not needed, because simply using a mask to extract the flags from a
pte is sufficient for all current users.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

4 files changed, 1 insertions, 22 deletions

diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index e9873a2e8695..6b9810859daf 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -147,7 +147,7 @@ static inline pteval_t native_pte_val(pte_t pte)
         return pte.pte;
 }
 
-static inline pteval_t native_pte_flags(pte_t pte)
+static inline pteval_t pte_flags(pte_t pte)
 {
         return native_pte_val(pte) & PTE_FLAGS_MASK;
 }
@@ -173,7 +173,6 @@ static inline pteval_t native_pte_flags(pte_t pte)
 #endif
 
 #define pte_val(x)      native_pte_val(x)
-#define pte_flags(x)    native_pte_flags(x)
 #define __pte(x)        native_make_pte(x)
 
 #endif  /* CONFIG_PARAVIRT */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index ba3e2ff6aedc..e25c410f3d8c 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -279,7 +279,6 @@ struct pv_mmu_ops {
                                         pte_t *ptep, pte_t pte);
 
         pteval_t (*pte_val)(pte_t);
-        pteval_t (*pte_flags)(pte_t);
         pte_t (*make_pte)(pteval_t pte);
 
         pgdval_t (*pgd_val)(pgd_t);
@@ -1084,23 +1083,6 @@ static inline pteval_t pte_val(pte_t pte)
         return ret;
 }
 
-static inline pteval_t pte_flags(pte_t pte)
-{
-        pteval_t ret;
-
-        if (sizeof(pteval_t) > sizeof(long))
-                ret = PVOP_CALL2(pteval_t, pv_mmu_ops.pte_flags,
-                                 pte.pte, (u64)pte.pte >> 32);
-        else
-                ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags,
-                                 pte.pte);
-
-#ifdef CONFIG_PARAVIRT_DEBUG
-        BUG_ON(ret & PTE_PFN_MASK);
-#endif
-        return ret;
-}
-
 static inline pgd_t __pgd(pgdval_t val)
 {
         pgdval_t ret;
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index e4c8fb608873..202514be5923 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -435,7 +435,6 @@ struct pv_mmu_ops pv_mmu_ops = {
 #endif /* PAGETABLE_LEVELS >= 3 */
 
         .pte_val = native_pte_val,
-        .pte_flags = native_pte_flags,
         .pgd_val = native_pgd_val,
 
         .make_pte = native_make_pte,
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index bea215230b20..6f1bb71aa13a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1314,7 +1314,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = {
         .ptep_modify_prot_commit = __ptep_modify_prot_commit,
 
         .pte_val = xen_pte_val,
-        .pte_flags = native_pte_flags,
         .pgd_val = xen_pgd_val,
 
         .make_pte = xen_make_pte,