From aa9002b5995336e9dfbaa4131186229b5106577e Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 18 May 2012 20:01:16 +0900
Subject: [PATCH] --- yaml --- r: 305298 b: refs/heads/master c:
 d8fd35fc586f74b2defe011d3a2bfb507871a407 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b5eb7c12a45c..5a8dd4389154 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3e0af98792f9f1c840dc969f883e46d0ced3e00
+refs/heads/master: d8fd35fc586f74b2defe011d3a2bfb507871a407
diff --git a/trunk/arch/sh/mm/fault.c b/trunk/arch/sh/mm/fault.c
index b0345f09c197..1fc25d85e515 100644
--- a/trunk/arch/sh/mm/fault.c
+++ b/trunk/arch/sh/mm/fault.c
@@ -160,6 +160,12 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
 	return pmd_k;
 }
 
+#ifdef CONFIG_SH_STORE_QUEUES
+#define __FAULT_ADDR_LIMIT	P3_ADDR_MAX
+#else
+#define __FAULT_ADDR_LIMIT	VMALLOC_END
+#endif
+
 /*
  * Handle a fault on the vmalloc or module mapping area
  */
@@ -170,7 +176,7 @@ static noinline int vmalloc_fault(unsigned long address)
 	pte_t *pte_k;
 
 	/* Make sure we are in vmalloc/module/P3 area: */
-	if (!(address >= P3SEG && address < P3_ADDR_MAX))
+	if (!(address >= VMALLOC_START && address < __FAULT_ADDR_LIMIT))
 		return -1;
 
 	/*