From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/frv/kernel/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/frv/kernel/process.c~frv-task_thread_info-task_stack_page arch/frv/kernel/process.c --- devel/arch/frv/kernel/process.c~frv-task_thread_info-task_stack_page 2006-01-04 22:02:27.000000000 -0800 +++ devel-akpm/arch/frv/kernel/process.c 2006-01-04 22:02:27.000000000 -0800 @@ -204,7 +204,7 @@ int copy_thread(int nr, unsigned long cl 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 cl *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; } _