Commit ab897d20 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

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: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f3b8436a

arch/x86/include/asm/page.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */

arch/x86/include/asm/paravirt.h

+0 −18
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/paravirt.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

arch/x86/xen/enlighten.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE