Signed-off-by: Jan Beulich <[EMAIL PROTECTED]>
arch/i386/mm/fault.c | 3 ++-
arch/x86_64/mm/fault.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.23-rc4/arch/i386/mm/fault.c 2007-08-28 09:41:59.000000000
+0200
+++ 2.6.23-rc4-x86-page-walk-pse/arch/i386/mm/fault.c 2007-08-15
12:20:48.000000000 +0200
@@ -570,7 +570,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)];
--- linux-2.6.23-rc4/arch/x86_64/mm/fault.c 2007-08-28 09:42:05.000000000
+0200
+++ 2.6.23-rc4-x86-page-walk-pse/arch/x86_64/mm/fault.c 2007-08-15
12:25:03.000000000 +0200
@@ -175,7 +175,7 @@ void dump_pagetable(unsigned long addres
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
