From: Al Viro rename alpha_task_regs() to task_pt_regs(), switch open-coded instances to use of the helper. Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/alpha/kernel/process.c | 19 ++----------------- arch/alpha/kernel/ptrace.c | 7 +++++++ include/asm-alpha/processor.h | 11 +---------- include/asm-alpha/ptrace.h | 4 ++-- 4 files changed, 12 insertions(+), 29 deletions(-) diff -puN arch/alpha/kernel/process.c~alpha-task_pt_regs arch/alpha/kernel/process.c --- devel/arch/alpha/kernel/process.c~alpha-task_pt_regs 2006-01-04 22:01:42.000000000 -0800 +++ devel-akpm/arch/alpha/kernel/process.c 2006-01-04 22:01:42.000000000 -0800 @@ -428,30 +428,15 @@ dump_elf_thread(elf_greg_t *dest, struct int dump_elf_task(elf_greg_t *dest, struct task_struct *task) { - struct thread_info *ti; - struct pt_regs *pt; - - ti = task->thread_info; - pt = (struct pt_regs *)((unsigned long)ti + 2*PAGE_SIZE) - 1; - - dump_elf_thread(dest, pt, ti); - + dump_elf_thread(dest, task_pt_regs(task), task_thread_info(task)); return 1; } int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task) { - struct thread_info *ti; - struct pt_regs *pt; - struct switch_stack *sw; - - ti = task->thread_info; - pt = (struct pt_regs *)((unsigned long)ti + 2*PAGE_SIZE) - 1; - sw = (struct switch_stack *)pt - 1; - + struct switch_stack *sw = (struct switch_stack *)task_pt_regs(task) - 1; memcpy(dest, sw->fp, 32 * 8); - return 1; } diff -puN arch/alpha/kernel/ptrace.c~alpha-task_pt_regs arch/alpha/kernel/ptrace.c --- devel/arch/alpha/kernel/ptrace.c~alpha-task_pt_regs 2006-01-04 22:01:42.000000000 -0800 +++ devel-akpm/arch/alpha/kernel/ptrace.c 2006-01-04 22:01:42.000000000 -0800 @@ -72,6 +72,13 @@ enum { REG_R0 = 0, REG_F0 = 32, REG_FPCR = 63, REG_PC = 64 }; +#define PT_REG(reg) \ + (PAGE_SIZE*2 - sizeof(struct pt_regs) + offsetof(struct pt_regs, reg)) + +#define SW_REG(reg) \ + (PAGE_SIZE*2 - sizeof(struct pt_regs) - sizeof(struct switch_stack) \ + + offsetof(struct switch_stack, reg)) + static int regoff[] = { PT_REG( r0), PT_REG( r1), PT_REG( r2), PT_REG( r3), PT_REG( r4), PT_REG( r5), PT_REG( r6), PT_REG( r7), diff -puN include/asm-alpha/processor.h~alpha-task_pt_regs include/asm-alpha/processor.h --- devel/include/asm-alpha/processor.h~alpha-task_pt_regs 2006-01-04 22:01:42.000000000 -0800 +++ devel-akpm/include/asm-alpha/processor.h 2006-01-04 22:01:42.000000000 -0800 @@ -52,16 +52,7 @@ extern long kernel_thread(int (*fn)(void unsigned long get_wchan(struct task_struct *p); -/* See arch/alpha/kernel/ptrace.c for details. */ -#define PT_REG(reg) \ - (PAGE_SIZE*2 - sizeof(struct pt_regs) + offsetof(struct pt_regs, reg)) - -#define SW_REG(reg) \ - (PAGE_SIZE*2 - sizeof(struct pt_regs) - sizeof(struct switch_stack) \ - + offsetof(struct switch_stack, reg)) - -#define KSTK_EIP(tsk) \ - (*(unsigned long *)(PT_REG(pc) + (unsigned long) ((tsk)->thread_info))) +#define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc) #define KSTK_ESP(tsk) \ ((tsk) == current ? rdusp() : task_thread_info(tsk)->pcb.usp) diff -puN include/asm-alpha/ptrace.h~alpha-task_pt_regs include/asm-alpha/ptrace.h --- devel/include/asm-alpha/ptrace.h~alpha-task_pt_regs 2006-01-04 22:01:42.000000000 -0800 +++ devel-akpm/include/asm-alpha/ptrace.h 2006-01-04 22:01:42.000000000 -0800 @@ -75,10 +75,10 @@ struct switch_stack { #define profile_pc(regs) instruction_pointer(regs) extern void show_regs(struct pt_regs *); -#define alpha_task_regs(task) \ +#define task_pt_regs(task) \ ((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1) -#define force_successful_syscall_return() (alpha_task_regs(current)->r0 = 0) +#define force_successful_syscall_return() (task_pt_regs(current)->r0 = 0) #endif _