Commit 18a7a199 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: add and use pgd/pud/pmd_flags 



Add pgd/pud/pmd_flags which are analogous to pte_flags, and use them
where-ever we only care about testing the flags portions of the
respective entries.

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

arch/x86/include/asm/page.h

+15 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ static inline pgdval_t native_pgd_val(pgd_t pgd) 
	return pgd.pgd;

}



static inline pgdval_t pgd_flags(pgd_t pgd)

{

	return native_pgd_val(pgd) & PTE_FLAGS_MASK;

}



#if PAGETABLE_LEVELS >= 3

#if PAGETABLE_LEVELS == 4

typedef struct { pudval_t pud; } pud_t;
@@ -117,6 +122,11 @@ static inline pudval_t native_pud_val(pud_t pud) 
}

#endif	/* PAGETABLE_LEVELS == 4 */



static inline pudval_t pud_flags(pud_t pud)

{

	return native_pud_val(pud) & PTE_FLAGS_MASK;

}



typedef struct { pmdval_t pmd; } pmd_t;



static inline pmd_t native_make_pmd(pmdval_t val)
@@ -128,6 +138,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) 
{

	return pmd.pmd;

}



static inline pmdval_t pmd_flags(pmd_t pmd)

{

	return native_pmd_val(pmd) & PTE_FLAGS_MASK;

}

#else  /* PAGETABLE_LEVELS == 2 */

#include <asm-generic/pgtable-nopmd.h>

arch/x86/include/asm/pgtable.h

+8 −8
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static inline unsigned long pte_pfn(pte_t pte) 


static inline int pmd_large(pmd_t pte)

{

	return (pmd_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==

	return (pmd_flags(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==

		(_PAGE_PSE | _PAGE_PRESENT);

}
@@ -458,7 +458,7 @@ static inline int pte_present(pte_t a) 


static inline int pmd_present(pmd_t pmd)

{

	return pmd_val(pmd) & _PAGE_PRESENT;

	return pmd_flags(pmd) & _PAGE_PRESENT;

}



static inline int pmd_none(pmd_t pmd)
@@ -516,7 +516,7 @@ static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address) 


static inline int pmd_bad(pmd_t pmd)

{

	return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;

	return (pmd_flags(pmd) & ~_PAGE_USER) != _KERNPG_TABLE;

}



static inline unsigned long pages_to_mb(unsigned long npg)
@@ -535,7 +535,7 @@ static inline int pud_none(pud_t pud) 


static inline int pud_present(pud_t pud)

{

	return pud_val(pud) & _PAGE_PRESENT;

	return pud_flags(pud) & _PAGE_PRESENT;

}



static inline unsigned long pud_page_vaddr(pud_t pud)
@@ -561,20 +561,20 @@ static inline unsigned long pmd_pfn(pmd_t pmd) 


static inline int pud_large(pud_t pud)

{

	return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==

	return (pud_flags(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==

		(_PAGE_PSE | _PAGE_PRESENT);

}



static inline int pud_bad(pud_t pud)

{

	return (pud_val(pud) & ~(PTE_PFN_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0;

	return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0;

}

#endif	/* PAGETABLE_LEVELS > 2 */



#if PAGETABLE_LEVELS > 3

static inline int pgd_present(pgd_t pgd)

{

	return pgd_val(pgd) & _PAGE_PRESENT;

	return pgd_flags(pgd) & _PAGE_PRESENT;

}



static inline unsigned long pgd_page_vaddr(pgd_t pgd)
@@ -600,7 +600,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) 


static inline int pgd_bad(pgd_t pgd)

{

	return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;

	return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;

}



static inline int pgd_none(pgd_t pgd)