Commit 7c683851 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pte_present 



Impact: cleanup

Unify and demacro pte_present.

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

arch/x86/include/asm/pgtable.h

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

}



static inline int pte_present(pte_t a)

{

	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);

}



#endif	/* __ASSEMBLY__ */



#ifdef CONFIG_X86_32

arch/x86/include/asm/pgtable_32.h

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); 
/* The boot page tables (all created as a single array) */

extern unsigned long pg0[];



#define pte_present(x)	((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))



/* To avoid harmful races, pmd_none(x) should check only the lower when PAE */

#define pmd_none(x)	(!(unsigned long)pmd_val((x)))

#define pmd_present(x)	(pmd_val((x)) & _PAGE_PRESENT)

arch/x86/include/asm/pgtable_64.h

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

}



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



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



/*