aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/pgtable_64.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86/pgtable_64.h')
-rw-r--r--include/asm-x86/pgtable_64.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h
index 84f47f9d7896..57e4ebe0f7fc 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/include/asm-x86/pgtable_64.h
@@ -17,7 +17,6 @@ extern pud_t level3_kernel_pgt[512];
17extern pud_t level3_ident_pgt[512]; 17extern pud_t level3_ident_pgt[512];
18extern pmd_t level2_kernel_pgt[512]; 18extern pmd_t level2_kernel_pgt[512];
19extern pgd_t init_level4_pgt[]; 19extern pgd_t init_level4_pgt[];
20extern unsigned long __supported_pte_mask;
21 20
22#define swapper_pg_dir init_level4_pgt 21#define swapper_pg_dir init_level4_pgt
23 22
@@ -165,14 +164,6 @@ static inline unsigned long pmd_bad(pmd_t pmd)
165#define pte_page(x) pfn_to_page(pte_pfn(x)) 164#define pte_page(x) pfn_to_page(pte_pfn(x))
166#define pte_pfn(x) ((pte_val(x) & __PHYSICAL_MASK) >> PAGE_SHIFT) 165#define pte_pfn(x) ((pte_val(x) & __PHYSICAL_MASK) >> PAGE_SHIFT)
167 166
168static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot)
169{
170 pte_t pte;
171 pte_val(pte) = (page_nr << PAGE_SHIFT);
172 pte_val(pte) |= pgprot_val(pgprot);
173 pte_val(pte) &= __supported_pte_mask;
174 return pte;
175}
176struct vm_area_struct; 167struct vm_area_struct;
177 168
178static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) 169static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
@@ -239,15 +230,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
239/* page, protection -> pte */ 230/* page, protection -> pte */
240#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) 231#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
241 232
242/* Change flags of a PTE */
243static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
244{
245 pte_val(pte) &= _PAGE_CHG_MASK;
246 pte_val(pte) |= pgprot_val(newprot);
247 pte_val(pte) &= __supported_pte_mask;
248 return pte;
249}
250
251#define pte_index(address) \ 233#define pte_index(address) \
252 (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) 234 (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
253#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \ 235#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \