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

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

x86: unify pud_page 



Impact: cleanup

Unify and demacro pud_page.

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

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

+0 −2
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ static inline void pud_clear(pud_t *pudp) 
		write_cr3(pgd);

}



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



/* 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

+6 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base) 
#endif



#ifndef __ASSEMBLY__

#include <linux/mm_types.h>



static inline int pte_none(pte_t pte)

{
@@ -477,6 +478,11 @@ static inline unsigned long pud_page_vaddr(pud_t pud) 
{

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

}



static inline struct page *pud_page(pud_t pud)

{

	return pfn_to_page(pud_val(pud) >> PAGE_SHIFT);

}

#endif	/* PAGETABLE_LEVELS > 2 */



#if PAGETABLE_LEVELS > 3

arch/x86/include/asm/pgtable_64.h

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +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(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)					\

	((pud_t *)pgd_page_vaddr(*(pgd)) + pud_index((address)))