[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>

2 files changed, 6 insertions, 7 deletions

diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index 2b760d0d9ce2..029bddab0459 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -197,8 +197,7 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *re
 
 static inline int elf_core_copy_task_regs(struct task_struct *t, elf_gregset_t* elfregs)
 {       
-        struct pt_regs *pp = (struct pt_regs *)(t->thread.rsp0);
-        --pp;
+        struct pt_regs *pp = task_pt_regs(t);
         ELF_CORE_COPY_REGS((*elfregs), pp);
         /* fix wrong segments */ 
         (*elfregs)[7] = t->thread.ds; 
@@ -217,7 +216,7 @@ elf_core_copy_task_fpregs(struct task_struct *tsk, struct pt_regs *regs, elf_fpr
         if (!tsk_used_math(tsk))
                 return 0;
         if (!regs)
-                regs = ((struct pt_regs *)tsk->thread.rsp0) - 1;
+                regs = task_pt_regs(tsk);
         if (tsk == current)
                 unlazy_fpu(tsk);
         set_fs(KERNEL_DS); 
@@ -233,7 +232,7 @@ elf_core_copy_task_fpregs(struct task_struct *tsk, struct pt_regs *regs, elf_fpr
 static inline int 
 elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
 {
-        struct pt_regs *regs = ((struct pt_regs *)(t->thread.rsp0))-1; 
+        struct pt_regs *regs = task_pt_regs(t);
         if (!tsk_used_math(t))
                 return 0;
         if (t == current)
diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c
index ea4394e021d6..23a4515a73b4 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86_64/ia32/ptrace32.c
@@ -41,7 +41,7 @@
 static int putreg32(struct task_struct *child, unsigned regno, u32 val)
 {
         int i;
-        __u64 *stack = (__u64 *)(child->thread.rsp0 - sizeof(struct pt_regs)); 
+        __u64 *stack = (__u64 *)task_pt_regs(child);
 
         switch (regno) {
         case offsetof(struct user32, regs.fs):
@@ -137,7 +137,7 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 val)
 
 static int getreg32(struct task_struct *child, unsigned regno, u32 *val)
 {
-        __u64 *stack = (__u64 *)(child->thread.rsp0 - sizeof(struct pt_regs)); 
+        __u64 *stack = (__u64 *)task_pt_regs(child);
 
         switch (regno) {
         case offsetof(struct user32, regs.fs):
@@ -238,7 +238,7 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
         if (ret < 0)
                 goto out;
 
-        childregs = (struct pt_regs *)(child->thread.rsp0 - sizeof(struct pt_regs)); 
+        childregs = task_pt_regs(child);
 
         switch (request) {
         case PTRACE_PEEKDATA: