1 files changed, 8 insertions, 8 deletions
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index af8aabe85800..4a8f8a259723 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -89,14 +89,14 @@ static int putreg(struct task_struct *child,
        unsigned long regno, unsigned long value)
 {
        switch (regno >> 2) {
-                case FS:
+                case GS:
                        if (value && (value & 3) != 3)
                                return -EIO;
-                        child->thread.fs = value;
+                        child->thread.gs = value;
                        return 0;
                case DS:
                case ES:
-                case GS:
+                case FS:
                        if (value && (value & 3) != 3)
                                return -EIO;
                        value &= 0xffff;
@@ -112,7 +112,7 @@ static int putreg(struct task_struct *child,
                        value |= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK;
                        break;
        }
-        if (regno > ES*4)
+        if (regno > FS*4)
                regno -= 1*4;
        put_stack_long(child, regno, value);
        return 0;
@@ -124,18 +124,18 @@ static unsigned long getreg(struct task_struct *child,
        unsigned long retval = ~0UL;
        switch (regno >> 2) {
-                case FS:
+                case GS:
-                        retval = child->thread.fs;
+                        retval = child->thread.gs;
                        break;
                case DS:
                case ES:
-                case GS:
+                case FS:
                case SS:
                case CS:
                        retval = 0xffff;
                        /* fall through */
                default:
-                        if (regno > ES*4)
+                        if (regno > FS*4)
                                regno -= 1*4;
                        retval &= get_stack_long(child, regno);
        }

diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index af8aabe85800..4a8f8a259723 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c
@@ -89,14 +89,14 @@ static int putreg(struct task_struct *child,
89	unsigned long regno, unsigned long value)	89	unsigned long regno, unsigned long value)
90	{	90	{
91	switch (regno >> 2) {	91	switch (regno >> 2) {
92	case FS:	92	case GS:
93	if (value && (value & 3) != 3)	93	if (value && (value & 3) != 3)
94	return -EIO;	94	return -EIO;
95	child->thread.fs = value;	95	child->thread.gs = value;
96	return 0;	96	return 0;
97	case DS:	97	case DS:
98	case ES:	98	case ES:
99	case GS:	99	case FS:
100	if (value && (value & 3) != 3)	100	if (value && (value & 3) != 3)
101	return -EIO;	101	return -EIO;
102	value &= 0xffff;	102	value &= 0xffff;
@@ -112,7 +112,7 @@ static int putreg(struct task_struct *child,
112	value \|= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK;	112	value \|= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK;
113	break;	113	break;
114	}	114	}
115	if (regno > ES*4)	115	if (regno > FS*4)
116	regno -= 1*4;	116	regno -= 1*4;
117	put_stack_long(child, regno, value);	117	put_stack_long(child, regno, value);
118	return 0;	118	return 0;
@@ -124,18 +124,18 @@ static unsigned long getreg(struct task_struct *child,
124	unsigned long retval = ~0UL;	124	unsigned long retval = ~0UL;
125		125
126	switch (regno >> 2) {	126	switch (regno >> 2) {
127	case FS:	127	case GS:
128	retval = child->thread.fs;	128	retval = child->thread.gs;
129	break;	129	break;
130	case DS:	130	case DS:
131	case ES:	131	case ES:
132	case GS:	132	case FS:
133	case SS:	133	case SS:
134	case CS:	134	case CS:
135	retval = 0xffff;	135	retval = 0xffff;
136	/* fall through */	136	/* fall through */
137	default:	137	default:
138	if (regno > ES*4)	138	if (regno > FS*4)
139	regno -= 1*4;	139	regno -= 1*4;
140	retval &= get_stack_long(child, regno);	140	retval &= get_stack_long(child, regno);
141	}	141	}