sparc64: task_pt_regs()
Subsystems (2)
PATCH 13/50 sparc64: task_pt_regs()
References: <[email protected]>
In-Reply-To: <[email protected]>
Signed-off-by Al Viro <[email protected]>
---
arch/sparc64/kernel/ptrace.c | 12 ++++++------ include/asm-sparc64/elf.h | 2 +- include/asm-sparc64/processor.h | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-)
e37dce1f4a97b22c68d77e7567aa62db3a7e47b4
arch/sparc64/kernel/ptrace.c +6 -6
@@ -320,7 +320,7 @@ asmlinkage void do_ptrace(struct pt_regscase PTRACE_GETREGS : {struct pt_regs32 __user *pregs = (struct pt_regs32 __user *) addr; -struct pt_regs *cregs = child->thread_info->kregs; +struct pt_regs *cregs =task_pt_regs (child);int rval; if (__put_user(tstate_to_psr(cregs->tstate), (&pregs->psr)) ||
@@ -344,7 +344,7 @@ asmlinkage void do_ptrace(struct pt_regscase PTRACE_GETREGS64 : {struct pt_regs __user *pregs = (struct pt_regs __user *) addr; -struct pt_regs *cregs = child->thread_info->kregs; +struct pt_regs *cregs =task_pt_regs (child);unsigned long tpc = cregs->tpc;int rval;
@@ -372,7 +372,7 @@ asmlinkage void do_ptrace(struct pt_regscase PTRACE_SETREGS : {struct pt_regs32 __user *pregs = (struct pt_regs32 __user *) addr; -struct pt_regs *cregs = child->thread_info->kregs; +struct pt_regs *cregs =task_pt_regs (child);unsigned int psr, pc, npc, y;int i;
@@ -405,7 +405,7 @@ asmlinkage void do_ptrace(struct pt_regscase PTRACE_SETREGS64 : {struct pt_regs __user *pregs = (struct pt_regs __user *) addr; -struct pt_regs *cregs = child->thread_info->kregs; +struct pt_regs *cregs =task_pt_regs (child);unsigned long tstate, tpc, tnpc, y;int i;
@@ -586,8 +586,8 @@ asmlinkage void do_ptrace(struct pt_regs#ifdef DEBUG_PTRACE printk ("CONT: %s [%d]: set exit_code = %x %lx %lx\n" , child->comm, child->pid, child->exit_code, - child->thread_info->kregs->tpc, - child->thread_info->kregs->tnpc); +task_pt_regs (child)->tpc, +task_pt_regs (child)->tnpc);#endif wake_up_process (child);
include/asm-sparc64/elf.h +1 -1
@@ -119,7 +119,7 @@ typedef struct {#endif #define ELF_CORE_COPY_TASK_REGS (__tsk, __elf_regs) \ - ({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread_info->kregs); 1; }) + ({ ELF_CORE_COPY_REGS((*(__elf_regs)), task_pt_regs(__tsk)); 1; })/* * This is used to ensure we don't load something for the wrong architecture.
include/asm-sparc64/processor.h +3 -2
@@ -186,8 +186,9 @@ extern pid_t kernel_thread(int (*fn)(voiextern unsigned long get_wchan (struct task_struct *task); -#define KSTK_EIP (tsk) ((tsk)->thread_info->kregs->tpc) -#define KSTK_ESP (tsk) ((tsk)->thread_info->kregs->u_regs[UREG_FP]) +#define task_pt_regs (tsk) (task_thread_info(tsk)->kregs) +#define KSTK_EIP (tsk) (task_pt_regs(tsk)->tpc) +#define KSTK_ESP (tsk) (task_pt_regs(tsk)->u_regs[UREG_FP])#define cpu_relax () barrier()
Signature · 1 line
0.99.9.GIT