Merge branch 'master'

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index df6c2bcde067..2333aead0563 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -554,7 +554,9 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
         struct pt_regs ptregs;
         
         ptregs = *(struct pt_regs *)
-                ((unsigned long)tsk->thread_info+THREAD_SIZE - sizeof(ptregs));
+                ((unsigned long)tsk->thread_info +
+                /* see comments in copy_thread() about -8 */
+                THREAD_SIZE - sizeof(ptregs) - 8);
         ptregs.xcs &= 0xffff;
         ptregs.xds &= 0xffff;
         ptregs.xes &= 0xffff;