Skip to contentSkip to conversation

x86/pvops: remove pte_flags pvop

PATCH In review Jeremy Fitzhardinge 1 participant 1 message Jan 22, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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.

---

arch/x86/include/asm/page.h     |    3 +--
arch/x86/include/asm/paravirt.h |   18 ------------------
arch/x86/kernel/paravirt.c      |    1 -
arch/x86/xen/enlighten.c        |    1 -
4 files changed, 1 insertion(+), 22 deletions(-)

===================================================================

arch/x86/include/asm/page.h +0 -0
@@ -154,7 +154,7 @@
	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;
}

@@ -180,7 +180,6 @@
#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 */
===================================================================

arch/x86/include/asm/paravirt.h +0 -0
@@ -280,7 +280,6 @@
					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);
@@ -1088,23 +1087,6 @@
	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;

===================================================================

arch/x86/kernel/paravirt.c +0 -0
@@ -435,7 +435,6 @@

#endif /* PAGETABLE_LEVELS >= 3 */

.pte_val = native_pte_val,
- .pte_flags = native_pte_flags,
.pgd_val = native_pgd_val,

.make_pte = native_make_pte,
===================================================================

arch/x86/xen/enlighten.c +0 -0
@@ -1348,7 +1348,6 @@
	.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,