aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-05 00:49:06 -0400
committerLen Brown <len.brown@intel.com>2005-08-05 00:49:06 -0400
commitc202ac9fbdb64145f034be266d6ee88c98b40aa8 (patch)
treef654a0a0d3f87cf82c3026670f9dda551dc82b2f /arch/x86_64
parent4be44fcd3bf648b782f4460fd06dfae6c42ded4b (diff)
parentc306895167c8384b88bc02945a0d226a04218fa5 (diff)
Merge ../to-linus
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/ia32/ptrace32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c
index b98b6d2462f..2a925e2af39 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86_64/ia32/ptrace32.c
@@ -43,11 +43,11 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 val)
switch (regno) {
case offsetof(struct user32, regs.fs):
if (val && (val & 3) != 3) return -EIO;
- child->thread.fs = val & 0xffff;
+ child->thread.fsindex = val & 0xffff;
break;
case offsetof(struct user32, regs.gs):
if (val && (val & 3) != 3) return -EIO;
- child->thread.gs = val & 0xffff;
+ child->thread.gsindex = val & 0xffff;
break;
case offsetof(struct user32, regs.ds):
if (val && (val & 3) != 3) return -EIO;
@@ -138,10 +138,10 @@ static int getreg32(struct task_struct *child, unsigned regno, u32 *val)
switch (regno) {
case offsetof(struct user32, regs.fs):
- *val = child->thread.fs;
+ *val = child->thread.fsindex;
break;
case offsetof(struct user32, regs.gs):
- *val = child->thread.gs;
+ *val = child->thread.gsindex;
break;
case offsetof(struct user32, regs.ds):
*val = child->thread.ds;