Commit 01ade20d authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pmd_offset 



Impact: cleanup

Unify and demacro pmd_offset.

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

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

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

}



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

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

				  pmd_index(address))



#ifdef CONFIG_SMP

static inline pte_t native_ptep_get_and_clear(pte_t *ptep)

{

arch/x86/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -504,6 +504,12 @@ static inline struct page *pud_page(pud_t pud) 
{

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

}



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

static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)

{

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

}

#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_offset(dir, address) ((pmd_t *)pud_page_vaddr(*(dir)) + \

				  pmd_index(address))

#define pfn_pmd(nr, prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val((prot))))

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