x86: unify pgd_present
authorJeremy Fitzhardinge <jeremy@goop.org>
Thu, 5 Feb 2009 19:30:49 +0000 (11:30 -0800)
committerJeremy Fitzhardinge <jeremy@goop.org>
Fri, 6 Feb 2009 20:31:07 +0000 (12:31 -0800)
Impact: cleanup

Unify and demacro pgd_present.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/pgtable_64.h

index c117b28df1512c210e26057b1a7ef3d92fc9d269..339e49a9bb6c74d6b71c331d3e7fe2187a750076 100644 (file)
@@ -452,6 +452,13 @@ static inline int pud_present(pud_t pud)
 }
 #endif /* PAGETABLE_LEVELS > 2 */
 
+#if PAGETABLE_LEVELS > 3
+static inline int pgd_present(pgd_t pgd)
+{
+       return pgd_val(pgd) & _PAGE_PRESENT;
+}
+#endif /* PAGETABLE_LEVELS > 3 */
+
 #endif /* __ASSEMBLY__ */
 
 #ifdef CONFIG_X86_32
index acdc27b202c88b659b539af45a372cbc13ae1d66..447634698f5d827829d05f3c4f8408a1750c9874 100644 (file)
@@ -182,7 +182,6 @@ static inline int pmd_bad(pmd_t pmd)
 #define pgd_page_vaddr(pgd)                                            \
        ((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_PFN_MASK))
 #define pgd_page(pgd)          (pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))
-#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)