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

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

x86: unify pmd_index 



Impact: cleanup

Unify and demacro pmd_index.

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

arch/x86/include/asm/pgtable.h

+11 −0
Original line number Diff line number Diff line
@@ -478,6 +478,17 @@ static inline struct page *pmd_page(pmd_t pmd) 
	return pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT);

}



/*

 * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]

 *

 * this macro returns the index of the entry in the pmd page which would

 * control the given virtual address

 */

static inline unsigned pmd_index(unsigned long address)

{

	return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);

}



#if PAGETABLE_LEVELS > 2

static inline int pud_present(pud_t pud)

{

arch/x86/include/asm/pgtable_32.h

+0 −9
Original line number Diff line number Diff line
@@ -104,15 +104,6 @@ extern unsigned long pg0[]; 


static inline int pud_large(pud_t pud) { return 0; }



/*

 * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]

 *

 * this macro returns the index of the entry in the pmd page which would

 * control the given virtual address

 */

#define pmd_index(address)				\

	(((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))



/*

 * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]

 *

arch/x86/include/asm/pgtable_64.h

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ static inline int pud_large(pud_t pte) 
}



/* PMD  - Level 2 access */

#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))

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