From 52697f9c2b089b35479e1870a72a08b76b61cf04 Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Sat, 19 Feb 2005 13:56:04 +0000
Subject: [PATCH] --- yaml --- r: 11007 b: refs/heads/master c:
 16033d6104f1704bea19ca2684b1c97731479048 h: refs/heads/master i:   11005:
 3fe7637d07f4c6c73c46fd90fd4c80e2395736ef   11003:
 d1a3c3048df3228b165494281180daf5ce9ef09c   10999:
 d04440c777e5639927ec890775cb36dae752aa88   10991:
 266735b658cd4883bb25ab04870db9706764149f   10975:
 a3a4aad514c2ce36b52a43a3ed7332cf4acc454f   10943:
 31ef4742488a194a83c40ccfab28567ee5071d01   10879:
 4cb1ebce28333dcf627abc49003b4a36071ba54f   10751:
 f249adead9eb16ac585881c40b2b15c710b5ccdf v: v3

---
 [refs]                     | 2 +-
 trunk/arch/mips/mm/fault.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8b7c9c150055..d858adf843e1 100644
--- 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
index 345a4d6ec20f..0eb43151f10a 100644
--- 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;
 
 	/*