diff options
-rw-r--r-- | arch/x86/include/asm/pgtable-3level.h | 5 | ||||
-rw-r--r-- | arch/x86/include/asm/pgtable.h | 5 | ||||
-rw-r--r-- | arch/x86/include/asm/pgtable_64.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index b92524eec202..3f13cdf61156 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h | |||
@@ -18,11 +18,6 @@ | |||
18 | printk("%s:%d: bad pgd %p(%016Lx).\n", \ | 18 | printk("%s:%d: bad pgd %p(%016Lx).\n", \ |
19 | __FILE__, __LINE__, &(e), pgd_val(e)) | 19 | __FILE__, __LINE__, &(e), pgd_val(e)) |
20 | 20 | ||
21 | static inline int pud_none(pud_t pud) | ||
22 | { | ||
23 | return pud_val(pud) == 0; | ||
24 | } | ||
25 | |||
26 | /* Rules for using set_pte: the pte being assigned *must* be | 21 | /* Rules for using set_pte: the pte being assigned *must* be |
27 | * either not present or in a state where the hardware will | 22 | * either not present or in a state where the hardware will |
28 | * not attempt to update the pte. In places where this is | 23 | * not attempt to update the pte. In places where this is |
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index d4cbc8188c8a..0ef49f3ebc88 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
@@ -525,6 +525,11 @@ static inline unsigned long pages_to_mb(unsigned long npg) | |||
525 | } | 525 | } |
526 | 526 | ||
527 | #if PAGETABLE_LEVELS > 2 | 527 | #if PAGETABLE_LEVELS > 2 |
528 | static inline int pud_none(pud_t pud) | ||
529 | { | ||
530 | return pud_val(pud) == 0; | ||
531 | } | ||
532 | |||
528 | static inline int pud_present(pud_t pud) | 533 | static inline int pud_present(pud_t pud) |
529 | { | 534 | { |
530 | return pud_val(pud) & _PAGE_PRESENT; | 535 | return pud_val(pud) & _PAGE_PRESENT; |
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 6c6c3c34bc5b..d58c2ee15c3c 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h | |||
@@ -68,7 +68,6 @@ extern void paging_init(void); | |||
68 | __FILE__, __LINE__, &(e), pgd_val(e)) | 68 | __FILE__, __LINE__, &(e), pgd_val(e)) |
69 | 69 | ||
70 | #define pgd_none(x) (!pgd_val(x)) | 70 | #define pgd_none(x) (!pgd_val(x)) |
71 | #define pud_none(x) (!pud_val(x)) | ||
72 | 71 | ||
73 | struct mm_struct; | 72 | struct mm_struct; |
74 | 73 | ||