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

Commit fb15a9b3 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: unify pgd_index 



pgd_index is common for 32 and 64-bit, so move it to a common place.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e7a9b0b3

include/asm-x86/pgtable.h

+20 −0
Original line number Diff line number Diff line
@@ -357,6 +357,26 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte); 
# include "pgtable_64.h"

#endif



/*

 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]

 *

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

 * control the given virtual address

 */

#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))



/*

 * pgd_offset() returns a (pgd_t *)

 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;

 */

#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))

/*

 * a shortcut which implies the use of the kernel's pgd, instead

 * of a process's

 */

#define pgd_offset_k(address) pgd_offset(&init_mm, (address))





#define KERNEL_PGD_BOUNDARY	pgd_index(PAGE_OFFSET)

#define KERNEL_PGD_PTRS		(PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)

include/asm-x86/pgtable_32.h

+0 −20
Original line number Diff line number Diff line
@@ -113,26 +113,6 @@ extern unsigned long pg0[]; 
 */

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



/*

 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]

 *

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

 * control the given virtual address

 */

#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))

#define pgd_index_k(addr) pgd_index((addr))



/*

 * pgd_offset() returns a (pgd_t *)

 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;

 */

#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))



/*

 * a shortcut which implies the use of the kernel's pgd, instead

 * of a process's

 */

#define pgd_offset_k(address) pgd_offset(&init_mm, (address))



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

include/asm-x86/pgtable_64.h

+0 −3
Original line number Diff line number Diff line
@@ -190,9 +190,6 @@ static inline int pmd_bad(pmd_t pmd) 
#define pgd_page_vaddr(pgd)						\

	((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_MASK))

#define pgd_page(pgd)		(pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))

#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))

#define pgd_offset(mm, address)	((mm)->pgd + pgd_index((address)))

#define pgd_offset_k(address) (init_level4_pgt + pgd_index((address)))

#define pgd_present(pgd) (pgd_val(pgd) & _PAGE_PRESENT)

static inline int pgd_large(pgd_t pgd) { return 0; }

#define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE)