Commit 346309cf authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pte_index 



Impact: cleanup

Unify and demacro pte_index.

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

arch/x86/include/asm/pgtable.h

+11 −0
Original line number Diff line number Diff line
@@ -498,6 +498,17 @@ static inline unsigned pmd_index(unsigned long address) 
 */

#define mk_pte(page, pgprot)   pfn_pte(page_to_pfn(page), (pgprot))



/*

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

 *

 * this function returns the index of the entry in the pte page which would

 * control the given virtual address

 */

static inline unsigned pte_index(unsigned long address)

{

	return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);

}



#if PAGETABLE_LEVELS > 2

static inline int pud_present(pud_t pud)

{

arch/x86/include/asm/pgtable_32.h

+0 −8
Original line number Diff line number Diff line
@@ -97,14 +97,6 @@ extern unsigned long pg0[]; 


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



/*

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

 *

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

 * control the given virtual address

 */

#define pte_index(address)					\

	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

#define pte_offset_kernel(dir, address)				\

	((pte_t *)pmd_page_vaddr(*(dir)) +  pte_index((address)))

arch/x86/include/asm/pgtable_64.h

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


/* PTE - Level 1 access. */



#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \

					 pte_index((address)))