From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/v850/kernel/process.c | 2 +- arch/v850/kernel/ptrace.c | 2 +- include/asm-v850/processor.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff -puN arch/v850/kernel/process.c~v850-task_stack_page-task_pt_regs arch/v850/kernel/process.c --- devel/arch/v850/kernel/process.c~v850-task_stack_page-task_pt_regs 2006-01-04 22:02:23.000000000 -0800 +++ devel-akpm/arch/v850/kernel/process.c 2006-01-04 22:02:23.000000000 -0800 @@ -114,7 +114,7 @@ int copy_thread (int nr, unsigned long c struct task_struct *p, struct pt_regs *regs) { /* Start pushing stuff from the top of the child's kernel stack. */ - unsigned long orig_ksp = (unsigned long)p->thread_info + THREAD_SIZE; + unsigned long orig_ksp = task_tos(p); unsigned long ksp = orig_ksp; /* We push two `state save' stack fames (see entry.S) on the new kernel stack: diff -puN arch/v850/kernel/ptrace.c~v850-task_stack_page-task_pt_regs arch/v850/kernel/ptrace.c --- devel/arch/v850/kernel/ptrace.c~v850-task_stack_page-task_pt_regs 2006-01-04 22:02:23.000000000 -0800 +++ devel-akpm/arch/v850/kernel/ptrace.c 2006-01-04 22:02:23.000000000 -0800 @@ -58,7 +58,7 @@ static v850_reg_t *reg_save_addr (unsign regs = thread_saved_regs (t); else /* Register saved during kernel entry (or not available). */ - regs = task_regs (t); + regs = task_pt_regs (t); return (v850_reg_t *)((char *)regs + reg_offs); } diff -puN include/asm-v850/processor.h~v850-task_stack_page-task_pt_regs include/asm-v850/processor.h --- devel/include/asm-v850/processor.h~v850-task_stack_page-task_pt_regs 2006-01-04 22:02:23.000000000 -0800 +++ devel-akpm/include/asm-v850/processor.h 2006-01-04 22:02:23.000000000 -0800 @@ -98,10 +98,10 @@ unsigned long get_wchan (struct task_str /* Return some info about the user process TASK. */ -#define task_tos(task) ((unsigned long)(task)->thread_info + THREAD_SIZE) -#define task_regs(task) ((struct pt_regs *)task_tos (task) - 1) -#define task_sp(task) (task_regs (task)->gpr[GPR_SP]) -#define task_pc(task) (task_regs (task)->pc) +#define task_tos(task) ((unsigned long)task_stack_page(task) + THREAD_SIZE) +#define task_pt_regs(task) ((struct pt_regs *)task_tos (task) - 1) +#define task_sp(task) (task_pt_regs (task)->gpr[GPR_SP]) +#define task_pc(task) (task_pt_regs (task)->pc) /* Grotty old names for some. */ #define KSTK_EIP(task) task_pc (task) #define KSTK_ESP(task) task_sp (task) _