aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/pgtable.h5
-rw-r--r--arch/x86/include/asm/pgtable_64.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index a871ae55a5c5..c1a36dd1e598 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -495,6 +495,11 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
495{ 495{
496 return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK); 496 return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);
497} 497}
498
499static inline struct page *pgd_page(pgd_t pgd)
500{
501 return pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT);
502}
498#endif /* PAGETABLE_LEVELS > 3 */ 503#endif /* PAGETABLE_LEVELS > 3 */
499 504
500#endif /* __ASSEMBLY__ */ 505#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 7edacc7ec89f..02477ad40fcd 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -179,7 +179,6 @@ static inline int pmd_bad(pmd_t pmd)
179/* 179/*
180 * Level 4 access. 180 * Level 4 access.
181 */ 181 */
182#define pgd_page(pgd) (pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))
183static inline int pgd_large(pgd_t pgd) { return 0; } 182static inline int pgd_large(pgd_t pgd) { return 0; }
184#define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE) 183#define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE)
185 184