[PATCH 5 of 8] x86: use PTE_MASK in pgtable_32.h

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Jeremy Fitzhardinge
Date: Tuesday, May 20, 2008 - 12:26 am

---
 include/asm-x86/pgtable_32.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
@@ -88,7 +88,7 @@
 /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */
 #define pmd_none(x)	(!(unsigned long)pmd_val((x)))
 #define pmd_present(x)	(pmd_val((x)) & _PAGE_PRESENT)
-#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+#define pmd_bad(x) ((pmd_val(x) & (~PTE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
 
 #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
 
@@ -159,7 +159,7 @@
 #define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))
 
 #define pmd_page_vaddr(pmd)					\
-	((unsigned long)__va(pmd_val((pmd)) & PAGE_MASK))
+	((unsigned long)__va(pmd_val((pmd)) & PTE_MASK))
 
 #if defined(CONFIG_HIGHPTE)
 #define pte_offset_map(dir, address)					\


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0 of 8] x86: use PTE_MASK consistently, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 1 of 8] x86: define PTE_MASK in a universally usefu ..., Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 2 of 8] x86: fix warning on 32-bit non-PAE, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 3 of 8] x86: rearrange __(VIRTUAL|PHYSICAL)_MASK, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 4 of 8] x86: use PTE_MASK in 32-bit PAE, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 5 of 8] x86: use PTE_MASK in pgtable_32.h, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 6 of 8] x86: clarify use of _PAGE_CHG_MASK, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 7 of 8] x86: use PTE_MASK rather than ad-hoc mask, Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
[PATCH 8 of 8] xen: use PTE_MASK in pte_mfn(), Jeremy Fitzhardinge, (Tue May 20, 12:26 am)
Re: [PATCH 0 of 8] x86: use PTE_MASK consistently, Hugh Dickins, (Tue May 20, 5:57 am)
[PATCH] x86: strengthen 64-bit p?d_bad(), Hugh Dickins, (Tue May 20, 5:59 am)
Re: [PATCH 0 of 8] x86: use PTE_MASK consistently, Jeremy Fitzhardinge, (Tue May 20, 6:47 am)
Re: [PATCH 0 of 8] x86: use PTE_MASK consistently, Linus Torvalds, (Tue May 20, 11:34 am)
Re: [PATCH 0 of 8] x86: use PTE_MASK consistently, Ingo Molnar, (Tue May 20, 12:51 pm)
Re: [PATCH 0 of 8] x86: use PTE_MASK consistently, Ingo Molnar, (Tue May 20, 12:55 pm)
Re: [PATCH 0 of 8] x86: use PTE_MASK consistently, Linus Torvalds, (Tue May 20, 1:02 pm)