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

x86: unify pmd_bad 



Impact: cleanup

Unify and demacro pmd_bad.

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

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -514,6 +514,11 @@ static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address) 
	return (pte_t *)pmd_page_vaddr(*pmd) + pte_index(address);

}



static inline int pmd_bad(pmd_t pmd)

{

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

}



#if PAGETABLE_LEVELS > 2

static inline int pud_present(pud_t pud)

{

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 pmd_bad(x) ((pmd_val(x) & (PTE_FLAGS_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)



#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))



#ifdef CONFIG_X86_PAE

arch/x86/include/asm/pgtable_64.h

+0 −5
Original line number Diff line number Diff line
@@ -154,11 +154,6 @@ static inline void native_pgd_clear(pgd_t *pgd) 


#ifndef __ASSEMBLY__



static inline int pmd_bad(pmd_t pmd)

{

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

}



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



/*