aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-05 14:31:14 -0500
committerJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 15:31:51 -0500
commit7325cc2e333cdaaabd2103552458876ea85adb33 (patch)
tree1640e3993318aecac8213b5a0b0d662b9c004f6b /arch/x86
parentdeb79cfb365c96ff960570d1bcf2c205424b6195 (diff)
x86: unify pgd_none
Impact: cleanup Unify and demacro pgd_none. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/pgtable.h5
-rw-r--r--arch/x86/include/asm/pgtable_64.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 0ef49f3ebc88..18afcd31e76c 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -599,6 +599,11 @@ static inline int pgd_bad(pgd_t pgd)
599{ 599{
600 return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; 600 return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
601} 601}
602
603static inline int pgd_none(pgd_t pgd)
604{
605 return !pgd_val(pgd);
606}
602#endif /* PAGETABLE_LEVELS > 3 */ 607#endif /* PAGETABLE_LEVELS > 3 */
603 608
604#endif /* __ASSEMBLY__ */ 609#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index d58c2ee15c3c..3b92a4ca4030 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -67,8 +67,6 @@ extern void paging_init(void);
67 printk("%s:%d: bad pgd %p(%016lx).\n", \ 67 printk("%s:%d: bad pgd %p(%016lx).\n", \
68 __FILE__, __LINE__, &(e), pgd_val(e)) 68 __FILE__, __LINE__, &(e), pgd_val(e))
69 69
70#define pgd_none(x) (!pgd_val(x))
71
72struct mm_struct; 70struct mm_struct;
73 71
74void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte); 72void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte);