Reapply changes lost during merge Signed-Off-By: Roman Zippel --- process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux/arch/m68k/kernel/process.c 2005/08/29 14:16:31 1.1.1.16 +++ linux/arch/m68k/kernel/process.c 2005/08/29 20:32:58 1.22 @@ -239,7 +239,7 @@ int copy_thread(int nr, unsigned long cl unsigned long stack_offset, *retp; stack_offset = THREAD_SIZE - sizeof(struct pt_regs); - childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset); + childregs = (struct pt_regs *) ((unsigned long)p->stack + stack_offset); *childregs = *regs; childregs->d0 = 0; @@ -384,7 +384,7 @@ unsigned long get_wchan(struct task_stru if (!p || p == current || p->state == TASK_RUNNING) return 0; - stack_page = (unsigned long)(p->thread_info); + stack_page = (unsigned long)p->stack; fp = ((struct switch_stack *)p->thread.ksp)->a6; do { if (fp < stack_page+sizeof(struct thread_info) ||