---

yaml --- r: 123567 b: refs/heads/master c: 252d4c2 h: refs/heads/master i: 123565: a480223 123563: b5d622d 123559: cbfc407 123551: b37cd6b v: v3
git-mirror · Nov 28, 2008 · 83ab431 · 83ab431
1 parent baf4023
commit 83ab431
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9210807cb5a3f19a0e954dd401e3a2c3626d1b48
+refs/heads/master: 252d4c276dc0895834af48743579cf19d1fa150b
diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
+#include <linux/page-flags.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -83,13 +84,14 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
 			break;
 		}
 
-#ifndef CONFIG_HIGHMEM
 		/* We must not map this if we have highmem enabled */
+		if (PageHighMem(pfn_to_page(pmd_val(*pmd) >> PAGE_SHIFT)))
+			break;
+
 		pte = pte_offset_map(pmd, addr);
 		printk(", *pte=%08lx", pte_val(*pte));
 		printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE]));
 		pte_unmap(pte);
-#endif
 	} while(0);
 
 	printk("\n");