From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/mips/kernel/process.c | 4 +--- arch/mips/kernel/ptrace.c | 12 ++++-------- arch/mips/kernel/ptrace32.c | 6 ++---- include/asm-mips/processor.h | 8 ++++---- include/asm-mips/system.h | 2 +- 5 files changed, 12 insertions(+), 20 deletions(-) diff -puN arch/mips/kernel/process.c~mips-task_pt_regs arch/mips/kernel/process.c --- devel/arch/mips/kernel/process.c~mips-task_pt_regs 2006-01-04 22:03:10.000000000 -0800 +++ devel-akpm/arch/mips/kernel/process.c 2006-01-04 22:03:10.000000000 -0800 @@ -229,9 +229,7 @@ void elf_dump_regs(elf_greg_t *gp, struc int dump_task_regs (struct task_struct *tsk, elf_gregset_t *regs) { - struct thread_info *ti = tsk->thread_info; - long ksp = (unsigned long)ti + THREAD_SIZE - 32; - elf_dump_regs(&(*regs)[0], (struct pt_regs *) ksp - 1); + elf_dump_regs(*regs, task_pt_regs(tsk)); return 1; } diff -puN arch/mips/kernel/ptrace32.c~mips-task_pt_regs arch/mips/kernel/ptrace32.c --- devel/arch/mips/kernel/ptrace32.c~mips-task_pt_regs 2006-01-04 22:03:10.000000000 -0800 +++ devel-akpm/arch/mips/kernel/ptrace32.c 2006-01-04 22:03:10.000000000 -0800 @@ -126,8 +126,7 @@ asmlinkage int sys32_ptrace(int request, struct pt_regs *regs; unsigned int tmp; - regs = (struct pt_regs *) ((unsigned long) child->thread_info + - THREAD_SIZE - 32 - sizeof(struct pt_regs)); + regs = task_pt_regs(child); ret = 0; /* Default return value. */ switch (addr) { @@ -263,8 +262,7 @@ asmlinkage int sys32_ptrace(int request, case PTRACE_POKEUSR: { struct pt_regs *regs; ret = 0; - regs = (struct pt_regs *) ((unsigned long) child->thread_info + - THREAD_SIZE - 32 - sizeof(struct pt_regs)); + regs = task_pt_regs(child); switch (addr) { case 0 ... 31: diff -puN arch/mips/kernel/ptrace.c~mips-task_pt_regs arch/mips/kernel/ptrace.c --- devel/arch/mips/kernel/ptrace.c~mips-task_pt_regs 2006-01-04 22:03:10.000000000 -0800 +++ devel-akpm/arch/mips/kernel/ptrace.c 2006-01-04 22:03:10.000000000 -0800 @@ -64,8 +64,7 @@ int ptrace_getregs (struct task_struct * if (!access_ok(VERIFY_WRITE, data, 38 * 8)) return -EIO; - regs = (struct pt_regs *) ((unsigned long) child->thread_info + - THREAD_SIZE - 32 - sizeof(struct pt_regs)); + regs = task_pt_regs(child); for (i = 0; i < 32; i++) __put_user (regs->regs[i], data + i); @@ -92,8 +91,7 @@ int ptrace_setregs (struct task_struct * if (!access_ok(VERIFY_READ, data, 38 * 8)) return -EIO; - regs = (struct pt_regs *) ((unsigned long) child->thread_info + - THREAD_SIZE - 32 - sizeof(struct pt_regs)); + regs = task_pt_regs(child); for (i = 0; i < 32; i++) __get_user (regs->regs[i], data + i); @@ -198,8 +196,7 @@ long arch_ptrace(struct task_struct *chi struct pt_regs *regs; unsigned long tmp = 0; - regs = (struct pt_regs *) ((unsigned long) child->thread_info + - THREAD_SIZE - 32 - sizeof(struct pt_regs)); + regs = task_pt_regs(child); ret = 0; /* Default return value. */ switch (addr) { @@ -318,8 +315,7 @@ long arch_ptrace(struct task_struct *chi case PTRACE_POKEUSR: { struct pt_regs *regs; ret = 0; - regs = (struct pt_regs *) ((unsigned long) child->thread_info + - THREAD_SIZE - 32 - sizeof(struct pt_regs)); + regs = task_pt_regs(child); switch (addr) { case 0 ... 31: diff -puN include/asm-mips/processor.h~mips-task_pt_regs include/asm-mips/processor.h --- devel/include/asm-mips/processor.h~mips-task_pt_regs 2006-01-04 22:03:10.000000000 -0800 +++ devel-akpm/include/asm-mips/processor.h 2006-01-04 22:03:10.000000000 -0800 @@ -201,11 +201,11 @@ extern void start_thread(struct pt_regs unsigned long get_wchan(struct task_struct *p); -#define __PT_REG(reg) ((long)&((struct pt_regs *)0)->reg - sizeof(struct pt_regs)) #define __KSTK_TOS(tsk) ((unsigned long)(tsk->thread_info) + THREAD_SIZE - 32) -#define KSTK_EIP(tsk) (*(unsigned long *)(__KSTK_TOS(tsk) + __PT_REG(cp0_epc))) -#define KSTK_ESP(tsk) (*(unsigned long *)(__KSTK_TOS(tsk) + __PT_REG(regs[29]))) -#define KSTK_STATUS(tsk) (*(unsigned long *)(__KSTK_TOS(tsk) + __PT_REG(cp0_status))) +#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]) +#define KSTK_STATUS(tsk) (task_pt_regs(tsk)->cp0_status) #define cpu_relax() barrier() diff -puN include/asm-mips/system.h~mips-task_pt_regs include/asm-mips/system.h --- devel/include/asm-mips/system.h~mips-task_pt_regs 2006-01-04 22:03:10.000000000 -0800 +++ devel-akpm/include/asm-mips/system.h 2006-01-04 22:03:10.000000000 -0800 @@ -159,7 +159,7 @@ struct task_struct; do { \ if (cpu_has_dsp) \ __save_dsp(prev); \ - (last) = resume(prev, next, next->thread_info); \ + (last) = resume(prev, next, task_thread_info(next)); \ if (cpu_has_dsp) \ __restore_dsp(current); \ } while(0) _