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>

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;