m32r: task_pt_regs(), task_stack_page(), task_thread_info()
Subsystems (2)
PATCH 25/50 m32r: task_pt_regs(), task_stack_page(), task_thread_info()
References: <[email protected]>
In-Reply-To: <[email protected]>
Signed-off-by Al Viro <[email protected]>
---
arch/m32r/kernel/process.c | 5 +---- arch/m32r/kernel/ptrace.c | 25 ++++--------------------- arch/m32r/kernel/smpboot.c | 2 +- include/asm-m32r/ptrace.h | 3 +++ 4 files changed, 9 insertions(+), 26 deletions(-)
280ab86fae79fc9399d24fbfa88baaf930fda0a3
arch/m32r/kernel/process.c +1 -4
@@ -238,13 +238,10 @@ int dump_fpu(struct pt_regs *regs, elf_fint copy_thread (int nr,unsigned long clone_flags,unsigned long spu,unsigned long unused,struct task_struct *tsk,struct pt_regs *regs) { -struct pt_regs *childregs; -unsigned long sp = (unsigned long )tsk->thread_info +THREAD_SIZE ; +struct pt_regs *childregs =task_pt_regs (tsk);extern void ret_from_fork (void );/* Copy registers */ - sp -=sizeof (struct pt_regs ); - childregs = (struct pt_regs *)sp; *childregs = *regs; childregs->spu = spu;
arch/m32r/kernel/ptrace.c +4 -21
@@ -35,23 +35,6 @@#include <asm/mmu_context.h> /* -* Get the address of the live pt_regs for the specified task. -* These are saved onto the top kernel stack when the process -* is not running. -* -* Note: if a user thread is execve'd from kernel space, the -* kernel stack will not be empty on entry to the kernel, so -* ptracing these tasks will fail. -*/ -static inline struct pt_regs * -get_user_regs (struct task_struct *task) -{ -return (struct pt_regs *) - ((unsigned long )task->thread_info +THREAD_SIZE - -sizeof (struct pt_regs )); -} - -/* * This routine will get a word off of the process kernel stack. */ static inline unsigned long int
@@ -59,7 +42,7 @@ get_stack_long(struct task_struct *task, {unsigned long *stack; - stack = (unsigned long *)get_user_regs (task); + stack = (unsigned long *)task_pt_regs (task);return stack[offset]; }
@@ -72,7 +55,7 @@ put_stack_long(struct task_struct *task, {unsigned long *stack; - stack = (unsigned long *)get_user_regs (task); + stack = (unsigned long *)task_pt_regs (task); stack[offset] = data;return 0 ;
@@ -208,7 +191,7 @@ static int ptrace_write_user(struct task*/ static int ptrace_getregs (struct task_struct *tsk,void __user *uregs) { -struct pt_regs *regs =get_user_regs (tsk); +struct pt_regs *regs =task_pt_regs (tsk);return copy_to_user (uregs, regs,sizeof (struct pt_regs )) ? -EFAULT :0 ; }
@@ -223,7 +206,7 @@ static int ptrace_setregs(struct task_st ret = -EFAULT ;if (copy_from_user (&newregs, uregs,sizeof (struct pt_regs )) ==0 ) { -struct pt_regs *regs =get_user_regs (tsk); +struct pt_regs *regs =task_pt_regs (tsk); *regs = newregs; ret =0 ; }
arch/m32r/kernel/smpboot.c +1 -1
@@ -286,7 +286,7 @@ static void __init do_boot_cpu(int phys_/* So we see what's up */ printk ("Booting processor %d/%d\n" , phys_id, cpu_id); stack_start.spi = (void *)idle->thread.sp; - idle->thread_info->cpu = cpu_id; +task_thread_info (idle)->cpu = cpu_id;/* * Send Startup IPI
include/asm-m32r/ptrace.h +3 -0
@@ -163,6 +163,9 @@ extern void show_regs(struct pt_regs *);extern void withdraw_debug_trap (struct pt_regs *regs); +#define task_pt_regs (task) \ + ((struct pt_regs *)(task_stack_page(task) + THREAD_SIZE) - 1) +#endif /* __KERNEL */ #endif /* _ASM_M32R_PTRACE_H */
Signature · 1 line
0.99.9.GIT