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

Commit 3fbc2444 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pte_offset_kernel 



Impact: cleanup

Unify and demacro pte_offset_kernel.

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

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -509,6 +509,11 @@ static inline unsigned pte_index(unsigned long address) 
	return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);

}



static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)

{

	return (pte_t *)pmd_page_vaddr(*pmd) + pte_index(address);

}



#if PAGETABLE_LEVELS > 2

static inline int pud_present(pud_t pud)

{

arch/x86/include/asm/pgtable_32.h

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


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



#define pte_offset_kernel(dir, address)				\

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



#if defined(CONFIG_HIGHPTE)

#define pte_offset_map(dir, address)					\

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) +		\

arch/x86/include/asm/pgtable_64.h

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


/* PTE - Level 1 access. */



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

					 pte_index((address)))



/* x86-64 always has all page tables mapped. */

#define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))

#define pte_offset_map_nested(dir, address) pte_offset_kernel((dir), (address))