summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-03 16:03:07 -0500
committerLen Brown <len.brown@intel.com>2006-01-03 16:03:07 -0500
commitd78fef14c2218ba9666687aabc57392c54569048 (patch)
tree273c138af78d03b65ac609aea44917e40f54f0ce /arch
parent04348e69e7e78ad69a09b2e1157f628d6c764370 (diff)
parent88026842b0a760145aa71d69e74fbc9ec118ca44 (diff)
Pull linus into release branch
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/process.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index df6c2bcde06..2333aead056 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;