From: Andrew Morton <akpm@osdl.org>

Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Ian Campbell <Ian.Campbell@XenSource.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <andi@muc.de>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/ptrace.c        |    2 +-
 arch/i386/math-emu/get_address.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -puN arch/i386/kernel/ptrace.c~convert-i386-pda-code-to-use-%fs-fixes arch/i386/kernel/ptrace.c
--- a/arch/i386/kernel/ptrace.c~convert-i386-pda-code-to-use-%fs-fixes
+++ a/arch/i386/kernel/ptrace.c
@@ -125,7 +125,7 @@ static unsigned long getreg(struct task_
 
 	switch (regno >> 2) {
 		case GS:
-			retval = child->thread.fs;
+			retval = child->thread.gs;
 			break;
 		case DS:
 		case ES:
diff -puN arch/i386/math-emu/get_address.c~convert-i386-pda-code-to-use-%fs-fixes arch/i386/math-emu/get_address.c
--- a/arch/i386/math-emu/get_address.c~convert-i386-pda-code-to-use-%fs-fixes
+++ a/arch/i386/math-emu/get_address.c
@@ -170,9 +170,9 @@ static long pm_address(u_char FPU_modrm,
     {
       /* gs isn't used by the kernel, so it still has its
 	 user-space value. */
-    case PREFIX_FS_-1:
+    case PREFIX_GS_-1:
       /* N.B. - movl %seg, mem is a 2 byte write regardless of prefix */
-      savesegment(fs, addr->selector);
+      savesegment(gs, addr->selector);
       break;
     default:
       addr->selector = PM_REG_(segment);
_