Bläddra i källkod

x86: unify pgd_none

Impact: cleanup

Unify and demacro pgd_none.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Jeremy Fitzhardinge 16 år sedan
förälder
incheckning
7325cc2e33
2 ändrade filer med 5 tillägg och 2 borttagningar
  1. 5 0
      arch/x86/include/asm/pgtable.h
  2. 0 2
      arch/x86/include/asm/pgtable_64.h

+ 5 - 0
arch/x86/include/asm/pgtable.h

@@ -599,6 +599,11 @@ static inline int pgd_bad(pgd_t pgd)
 {
 {
 	return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
 	return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
 }
 }
+
+static inline int pgd_none(pgd_t pgd)
+{
+	return !pgd_val(pgd);
+}
 #endif	/* PAGETABLE_LEVELS > 3 */
 #endif	/* PAGETABLE_LEVELS > 3 */
 
 
 #endif	/* __ASSEMBLY__ */
 #endif	/* __ASSEMBLY__ */

+ 0 - 2
arch/x86/include/asm/pgtable_64.h

@@ -67,8 +67,6 @@ extern void paging_init(void);
 	printk("%s:%d: bad pgd %p(%016lx).\n",		\
 	printk("%s:%d: bad pgd %p(%016lx).\n",		\
 	       __FILE__, __LINE__, &(e), pgd_val(e))
 	       __FILE__, __LINE__, &(e), pgd_val(e))
 
 
-#define pgd_none(x)	(!pgd_val(x))
-
 struct mm_struct;
 struct mm_struct;
 
 
 void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte);
 void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte);