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

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
...@@ -509,6 +509,11 @@ static inline unsigned pte_index(unsigned long address) ...@@ -509,6 +509,11 @@ static inline unsigned pte_index(unsigned long address)
return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1); 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 #if PAGETABLE_LEVELS > 2
static inline int pud_present(pud_t pud) static inline int pud_present(pud_t pud)
{ {
......
...@@ -97,9 +97,6 @@ extern unsigned long pg0[]; ...@@ -97,9 +97,6 @@ extern unsigned long pg0[];
static inline int pud_large(pud_t pud) { return 0; } 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) #if defined(CONFIG_HIGHPTE)
#define pte_offset_map(dir, address) \ #define pte_offset_map(dir, address) \
((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \ ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \
......
...@@ -198,9 +198,6 @@ static inline int pud_large(pud_t pte) ...@@ -198,9 +198,6 @@ static inline int pud_large(pud_t pte)
/* PTE - Level 1 access. */ /* 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. */ /* x86-64 always has all page tables mapped. */
#define pte_offset_map(dir, address) pte_offset_kernel((dir), (address)) #define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))
#define pte_offset_map_nested(dir, address) pte_offset_kernel((dir), (address)) #define pte_offset_map_nested(dir, address) pte_offset_kernel((dir), (address))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment