[PATCH] amd64: task_pt_regs()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 4 insertions, 11 deletions

diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 2ea4acd47fc2..68df519c83e6 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -822,8 +822,7 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
 {
         struct pt_regs *pp, ptregs;
 
-        pp = (struct pt_regs *)(tsk->thread.rsp0);
-        --pp; 
+        pp = task_pt_regs(tsk);
 
         ptregs = *pp; 
         ptregs.cs &= 0xffff;
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index 86248bc9303e..53205622351c 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -67,12 +67,6 @@ static inline unsigned long get_stack_long(struct task_struct *task, int offset)
         return (*((unsigned long *)stack));
 }
 
-static inline struct pt_regs *get_child_regs(struct task_struct *task)
-{
-        struct pt_regs *regs = (void *)task->thread.rsp0;
-        return regs - 1;
-}
-
 /*
  * this routine will put a word on the processes privileged stack. 
  * the offset is how far from the base addr as stored in the TSS.  
@@ -170,7 +164,7 @@ static int is_at_popf(struct task_struct *child, struct pt_regs *regs)
 
 static void set_singlestep(struct task_struct *child)
 {
-        struct pt_regs *regs = get_child_regs(child);
+        struct pt_regs *regs = task_pt_regs(child);
 
         /*
          * Always set TIF_SINGLESTEP - this guarantees that
@@ -208,7 +202,7 @@ static void clear_singlestep(struct task_struct *child)
 
         /* But touch TF only if it was set by us.. */
         if (child->ptrace & PT_DTRACE) {
-                struct pt_regs *regs = get_child_regs(child);
+                struct pt_regs *regs = task_pt_regs(child);
                 regs->eflags &= ~TRAP_FLAG;
                 child->ptrace &= ~PT_DTRACE;
         }
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index d8f90b48aec4..8bb0aeda78b9 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -666,7 +666,7 @@ asmlinkage struct pt_regs *sync_regs(struct pt_regs *eregs)
                 ;
         /* Exception from user space */
         else if (user_mode(eregs))
-                regs = ((struct pt_regs *)current->thread.rsp0) - 1;
+                regs = task_pt_regs(current);
         /* Exception from kernel and interrupts are enabled. Move to
            kernel process stack. */
         else if (eregs->eflags & X86_EFLAGS_IF)