Commit 7f84133a authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Linus Torvalds
Browse files

x86: use PTE_MASK in pgtable_32.h 



Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a4d68862

include/asm-x86/pgtable_32.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ extern unsigned long pg0[]; 
/* 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 @@ static inline int pud_large(pud_t pud) { return 0; } 
#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)					\