From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/mips/kernel/process.c | 6 +++--- include/asm-mips/processor.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/mips/kernel/process.c~mips-task_stack_page arch/mips/kernel/process.c --- devel/arch/mips/kernel/process.c~mips-task_stack_page 2006-01-04 22:03:14.000000000 -0800 +++ devel-akpm/arch/mips/kernel/process.c 2006-01-04 22:03:14.000000000 -0800 @@ -140,12 +140,12 @@ void flush_thread(void) int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, unsigned long unused, struct task_struct *p, struct pt_regs *regs) { - struct thread_info *ti = p->thread_info; + struct thread_info *ti = task_thread_info(p); struct pt_regs *childregs; long childksp; p->set_child_tid = p->clear_child_tid = NULL; - childksp = (unsigned long)ti + THREAD_SIZE - 32; + childksp = (unsigned long)task_stack_page(p) + THREAD_SIZE - 32; preempt_disable(); @@ -407,7 +407,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)task_stack_page(p); if (!stack_page || !mips_frame_info_initialized) return 0; diff -puN include/asm-mips/processor.h~mips-task_stack_page include/asm-mips/processor.h --- devel/include/asm-mips/processor.h~mips-task_stack_page 2006-01-04 22:03:14.000000000 -0800 +++ devel-akpm/include/asm-mips/processor.h 2006-01-04 22:03:14.000000000 -0800 @@ -201,7 +201,7 @@ extern void start_thread(struct pt_regs unsigned long get_wchan(struct task_struct *p); -#define __KSTK_TOS(tsk) ((unsigned long)(tsk->thread_info) + THREAD_SIZE - 32) +#define __KSTK_TOS(tsk) ((unsigned long)task_stack_page(tsk) + THREAD_SIZE - 32) #define task_pt_regs(tsk) ((struct pt_regs *)__KSTK_TOS(tsk) - 1) #define KSTK_EIP(tsk) (task_pt_regs(tsk)->cp0_epc) #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[29]) _