diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-10-19 20:35:03 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 20:35:03 +0200 |
| commit | b1992df3f070475b243b12ca1241a5938ef5f9bc (patch) | |
| tree | 2d5baf49cc4522cad732ca667786d2157b3b866f /arch | |
| parent | 1f503e7743df91eb6f63af27c310c557edfc3307 (diff) | |
| download | linux-b1992df3f070475b243b12ca1241a5938ef5f9bc.tar.gz linux-b1992df3f070475b243b12ca1241a5938ef5f9bc.tar.bz2 linux-b1992df3f070475b243b12ca1241a5938ef5f9bc.zip | |
x86: honor _PAGE_PSE bit on page walks
[ tglx: arch/x86 adaptation ]
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/fault_32.c | 3 | ||||
| -rw-r--r-- | arch/x86/mm/fault_64.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index 6555c3d14371..c9a03f73986e 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c @@ -564,7 +564,8 @@ no_context: * it's allocated already. */ if ((page >> PAGE_SHIFT) < max_low_pfn - && (page & _PAGE_PRESENT)) { + && (page & _PAGE_PRESENT) + && !(page & _PAGE_PSE)) { page &= PAGE_MASK; page = ((__typeof__(page) *) __va(page))[(address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)]; diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c index a881f0796169..1e631745ca41 100644 --- a/arch/x86/mm/fault_64.c +++ b/arch/x86/mm/fault_64.c @@ -169,7 +169,7 @@ void dump_pagetable(unsigned long address) pmd = pmd_offset(pud, address); if (bad_address(pmd)) goto bad; printk("PMD %lx ", pmd_val(*pmd)); - if (!pmd_present(*pmd)) goto ret; + if (!pmd_present(*pmd) || pmd_large(*pmd)) goto ret; pte = pte_offset_kernel(pmd, address); if (bad_address(pte)) goto bad; |