From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 12 Jan 2006 09:05:53 +0000 (-0800)
Subject: [PATCH] frv: task_thread_info(), task_stack_page()
X-Git-Tag: v2.6.16-rc1~248
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=097cb338c72b4916d8221278caba63d74d9f19d6;p=linux-2.6-omap-h63xx.git

[PATCH] frv: task_thread_info(), task_stack_page()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index c4488379ac3..0fff8a61ef2 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -204,7 +204,7 @@ int copy_thread(int nr, unsigned long clone_flags,
 
 	regs0 = __kernel_frame0_ptr;
 	childregs0 = (struct pt_regs *)
-		((unsigned long) p->thread_info + THREAD_SIZE - USER_CONTEXT_SIZE);
+		(task_stack_page(p) + THREAD_SIZE - USER_CONTEXT_SIZE);
 	childregs = childregs0;
 
 	/* set up the userspace frame (the only place that the USP is stored) */
@@ -220,7 +220,7 @@ int copy_thread(int nr, unsigned long clone_flags,
 		*childregs = *regs;
 		childregs->sp = (unsigned long) childregs0;
 		childregs->next_frame = childregs0;
-		childregs->gr15 = (unsigned long) p->thread_info;
+		childregs->gr15 = (unsigned long) task_thread_info(p);
 		childregs->gr29 = (unsigned long) p;
 	}