From aa302a253911bdd9aec84987d6ed13b4f7802c69 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Thu, 29 Mar 2012 14:02:52 -0400
Subject: [PATCH] --- yaml --- r: 298833 b: refs/heads/master c:
 b287f69676a34a9fc341de4d79a9c74e1959dec6 h: refs/heads/master i:   298831:
 7c3654bda56adf05c10377e7f8a4512fab3aa1d5 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/tile/kernel/process.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0839ad1e5efd..2795f8e570fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe224705e573cead57c4d4bed0c91efb564a344
+refs/heads/master: b287f69676a34a9fc341de4d79a9c74e1959dec6
diff --git a/trunk/arch/tile/kernel/process.c b/trunk/arch/tile/kernel/process.c
index ee01b1c683e4..2d5ef617bb39 100644
--- a/trunk/arch/tile/kernel/process.c
+++ b/trunk/arch/tile/kernel/process.c
@@ -286,7 +286,7 @@ struct task_struct *validate_current(void)
 	static struct task_struct corrupt = { .comm = "<corrupt>" };
 	struct task_struct *tsk = current;
 	if (unlikely((unsigned long)tsk < PAGE_OFFSET ||
-		     (void *)tsk > high_memory ||
+		     (high_memory && (void *)tsk > high_memory) ||
 		     ((unsigned long)tsk & (__alignof__(*tsk) - 1)) != 0)) {
 		pr_err("Corrupt 'current' %p (sp %#lx)\n", tsk, stack_pointer);
 		tsk = &corrupt;