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

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

x86: unify pgd_page_vaddr 



Impact: cleanup

Unify and demacro pgd_page_vaddr.

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

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -469,6 +469,11 @@ static inline int pgd_present(pgd_t pgd) 
{

	return pgd_val(pgd) & _PAGE_PRESENT;

}



static inline unsigned long pgd_page_vaddr(pgd_t pgd)

{

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

}

#endif	/* PAGETABLE_LEVELS > 3 */



#endif	/* __ASSEMBLY__ */

arch/x86/include/asm/pgtable_64.h

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ static inline int pmd_bad(pmd_t pmd) 
/*

 * Level 4 access.

 */

#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))

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

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