From 879351bc87df5aad7942ad8f45d07d27c5fd4a3c Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Tue, 6 Nov 2007 15:30:38 -0800
Subject: [PATCH] --- yaml --- r: 73427 b: refs/heads/master c:
 fd181c72a3c202a3986bcee7551c0838265aec2a h: refs/heads/master i:   73425:
 c3adfa30373d1b3a047e05ae6a5cd31ab5e40151   73423:
 d47c73f3b45f9b9f17da57c1103c90cfe187e8a4 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86/ia32/ptrace32.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 72971c2be1c1..b3cd8530fb04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a0c3ea65ca4838a803a14f0ff2bfc78aa69c9a0
+refs/heads/master: fd181c72a3c202a3986bcee7551c0838265aec2a
diff --git a/trunk/arch/x86/ia32/ptrace32.c b/trunk/arch/x86/ia32/ptrace32.c
index f52770ef0ee3..4a233ad6269c 100644
--- a/trunk/arch/x86/ia32/ptrace32.c
+++ b/trunk/arch/x86/ia32/ptrace32.c
@@ -228,8 +228,6 @@ static long ptrace32_siginfo(unsigned request, u32 pid, u32 addr, u32 data)
 	return ret;
 }
 
-#define COMPAT_GDT_ENTRY_TLS_MIN 6
-
 asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
 {
 	struct task_struct *child;
@@ -248,6 +246,8 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
 	case PTRACE_SYSCALL:
 	case PTRACE_OLDSETOPTIONS:
 	case PTRACE_SETOPTIONS:
+	case PTRACE_SET_THREAD_AREA:
+	case PTRACE_GET_THREAD_AREA:
 		return sys_ptrace(request, pid, addr, data); 
 
 	default:
@@ -271,12 +271,6 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
 	case PTRACE_SETSIGINFO:
 	case PTRACE_GETSIGINFO:
 		return ptrace32_siginfo(request, pid, addr, data);
-
-	case PTRACE_SET_THREAD_AREA:
-	case PTRACE_GET_THREAD_AREA:
-		return sys_ptrace(request, pid,
-			addr + GDT_ENTRY_TLS_MIN - COMPAT_GDT_ENTRY_TLS_MIN,
-			data);
 	}
 
 	child = ptrace_get_task_struct(pid);