diff --git a/[refs] b/[refs] index dd99959e688c..d7ca8defc494 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de9e007d9105bf8fa613a89810feff32a43add03 +refs/heads/master: 557962a926c62a9c4bd79d6b36df873d4f8c51ef diff --git a/trunk/arch/i386/kernel/process.c b/trunk/arch/i386/kernel/process.c index df6c2bcde067..2333aead0563 100644 --- a/trunk/arch/i386/kernel/process.c +++ b/trunk/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;