Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a4d6886270a5c892d71cd6e09186196a150a50dc

Authored by Jeremy Fitzhardinge
Committed by Linus Torvalds
1 parent c57c05d003
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86: use PTE_MASK in 32-bit PAE 

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

include/asm-x86/pgtable-3level.h
Diff comments   View file @ a4d6886
... ... @@ -120,9 +120,9 @@
120 120 write_cr3(pgd);
121 121 }
122 122  
123   -#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PAGE_MASK))
  123 +#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_MASK))
124 124  
125   -#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
  125 +#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_MASK))
126 126  
127 127  
128 128 /* Find an entry in the second-level page table.. */
... ... @@ -160,7 +160,7 @@
160 160  
161 161 static inline unsigned long pte_pfn(pte_t pte)
162 162 {
163   - return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT;
  163 + return (pte_val(pte) & PTE_MASK) >> PAGE_SHIFT;
164 164 }
165 165  
166 166 /*