Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a034a010 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pte_none 



Impact: cleanup

Unify and demacro pte_none.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 45c82b5a

arch/x86/include/asm/pgtable-2level.h

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp) 
#define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp)

#endif



#define pte_none(x)		(!(x).pte_low)



/*

 * Bits _PAGE_BIT_PRESENT, _PAGE_BIT_FILE and _PAGE_BIT_PROTNONE are taken,

 * split up the 29 bits of offset into this range:

arch/x86/include/asm/pgtable-3level.h

+0 −5
Original line number Diff line number Diff line
@@ -151,11 +151,6 @@ static inline int pte_same(pte_t a, pte_t b) 
	return a.pte_low == b.pte_low && a.pte_high == b.pte_high;

}



static inline int pte_none(pte_t pte)

{

	return !pte.pte_low && !pte.pte_high;

}



/*

 * Bits 0, 6 and 7 are taken in the low part of the pte,

 * put the 32 bits of offset into the high part.

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -429,6 +429,11 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base) 
}

#endif	/* CONFIG_PARAVIRT */



static inline int pte_none(pte_t pte)

{

	return !pte.pte;

}



#endif	/* __ASSEMBLY__ */



#ifdef CONFIG_X86_32

arch/x86/include/asm/pgtable_64.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static inline int pmd_bad(pmd_t pmd) 
	return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;

}



#define pte_none(x)	(!pte_val((x)))

#define pte_present(x)	(pte_val((x)) & (_PAGE_PRESENT | _PAGE_PROTNONE))



#define pages_to_mb(x)	((x) >> (20 - PAGE_SHIFT))   /* FIXME: is this right? */