---

yaml --- r: 11007 b: refs/heads/master c: 16033d6 h: refs/heads/master i: 11005: 3fe7637 11003: d1a3c30 10999: d04440c 10991: 266735b 10975: a3a4aad 10943: 31ef474 10879: 4cb1ebc 10751: f249ade v: v3
git-mirror · Oct 29, 2005 · 52697f9 · 52697f9
1 parent a50f981
commit 52697f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a51b270f6d87674b713705ba9533440ca41b6c
+refs/heads/master: 16033d6104f1704bea19ca2684b1c97731479048
diff --git a/trunk/arch/mips/mm/fault.c b/trunk/arch/mips/mm/fault.c
@@ -25,6 +25,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
+#include <asm/highmem.h>		/* For VMALLOC_END */
 
 /*
  * This routine handles page faults.  It determines the address,
@@ -57,7 +58,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
 	 * only copy the information from the master page table,
 	 * nothing more.
 	 */
-	if (unlikely(address >= VMALLOC_START))
+	if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END))
 		goto vmalloc_fault;
 
 	/*