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

Commit 9f38d7e8 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pgd_present 



Impact: cleanup

Unify and demacro pgd_present.

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

arch/x86/include/asm/pgtable.h

+7 −0
Original line number Diff line number Diff line
@@ -452,6 +452,13 @@ static inline int pud_present(pud_t pud) 
}

#endif	/* PAGETABLE_LEVELS > 2 */



#if PAGETABLE_LEVELS > 3

static inline int pgd_present(pgd_t pgd)

{

	return pgd_val(pgd) & _PAGE_PRESENT;

}

#endif	/* PAGETABLE_LEVELS > 3 */



#endif	/* __ASSEMBLY__ */



#ifdef CONFIG_X86_32

arch/x86/include/asm/pgtable_64.h

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static inline int pmd_bad(pmd_t pmd) 
#define pgd_page_vaddr(pgd)						\

	((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_PFN_MASK))

#define pgd_page(pgd)		(pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))

#define pgd_present(pgd) (pgd_val(pgd) & _PAGE_PRESENT)

static inline int pgd_large(pgd_t pgd) { return 0; }

#define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE)