lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: use PTE_MASK in 32-bit PAE

Browse Source 
Use PTE_MASK in 3-level pagetables (ie, 32-bit PAE).

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tested-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeremy Fitzhardinge
2008-05-20 08:26:20 +01:00
committed by Linus Torvalds
parent c57c05d003
commit a4d6886270
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-x86/pgtable-3level.h
View File

@@ -120,9 +120,9 @@ static inline void pud_clear(pud_t *pudp)
write_cr3(pgd); write_cr3(pgd);
} }
#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PAGE_MASK)) #define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_MASK))
#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK)) #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_MASK))
/* Find an entry in the second-level page table.. */ /* Find an entry in the second-level page table.. */
@@ -160,7 +160,7 @@ static inline int pte_none(pte_t pte)
static inline unsigned long pte_pfn(pte_t pte) static inline unsigned long pte_pfn(pte_t pte)
{ {
return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT; return (pte_val(pte) & PTE_MASK) >> PAGE_SHIFT;
} }
/* /*