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

Commit 6fff47e3 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pud_page_vaddr 



Impact: cleanup

Unify and demacro pud_page_vaddr.

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

arch/x86/include/asm/pgtable-3level.h

+0 −3
Original line number Diff line number Diff line
@@ -117,9 +117,6 @@ static inline void pud_clear(pud_t *pudp) 


#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)



#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_PFN_MASK))





/* Find an entry in the second-level page table.. */

#define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) +	\

				  pmd_index(address))

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -462,6 +462,11 @@ static inline int pud_present(pud_t pud) 
{

	return pud_val(pud) & _PAGE_PRESENT;

}



static inline unsigned long pud_page_vaddr(pud_t pud)

{

	return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);

}

#endif	/* PAGETABLE_LEVELS > 2 */



#if PAGETABLE_LEVELS > 3

arch/x86/include/asm/pgtable_64.h

+0 −2
Original line number Diff line number Diff line
@@ -185,8 +185,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 


/* PUD - Level3 access */

/* to find an entry in a page-table-directory. */

#define pud_page_vaddr(pud)						\

	((unsigned long)__va(pud_val((pud)) & PHYSICAL_PAGE_MASK))

#define pud_page(pud)	(pfn_to_page(pud_val((pud)) >> PAGE_SHIFT))

#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))

#define pud_offset(pgd, address)					\