---

yaml --- r: 298833 b: refs/heads/master c: b287f69 h: refs/heads/master i: 298831: 7c3654b v: v3
git-mirror · Apr 2, 2012 · aa302a2 · aa302a2
1 parent 8edf9ff
commit aa302a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;