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

Commit 3180fba0 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pmd_pfn 



Impact: cleanup

Unify and demacro pmd_pfn.

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

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -510,6 +510,11 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) 
{

	return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);

}



static inline unsigned long pmd_pfn(pmd_t pmd)

{

	return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;

}

#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
@@ -191,8 +191,6 @@ static inline int pud_large(pud_t pte) 
}



/* PMD  - Level 2 access */

#define pmd_pfn(x)  ((pmd_val((x)) & __PHYSICAL_MASK) >> PAGE_SHIFT)



#define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT)

#define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) |	\

					    _PAGE_FILE })