From e859bce54d1985191101c5c7589055085cec09b9 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 5 Sep 2007 03:05:56 -0700
Subject: [PATCH] --- yaml --- r: 64765 b: refs/heads/master c:
 7d94143291e4e625e2bc3b1ebdc7143ee7a9a2f1 h: refs/heads/master i:   64763:
 037c58011eb51a9e2c731036536a386b45fec6e6 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/i386/kernel/ptrace.c | 1 -
 trunk/arch/ia64/kernel/ptrace.c | 1 -
 trunk/arch/m68k/kernel/ptrace.c | 1 -
 trunk/kernel/ptrace.c           | 1 +
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index df14a4fc3cf6..874fca6601a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 897ee77bfba12b83752027427a41009961458ee6
+refs/heads/master: 7d94143291e4e625e2bc3b1ebdc7143ee7a9a2f1
diff --git a/trunk/arch/i386/kernel/ptrace.c b/trunk/arch/i386/kernel/ptrace.c
index 0c8f00e69c4d..7c1b92522e95 100644
--- a/trunk/arch/i386/kernel/ptrace.c
+++ b/trunk/arch/i386/kernel/ptrace.c
@@ -274,7 +274,6 @@ static void clear_singlestep(struct task_struct *child)
 void ptrace_disable(struct task_struct *child)
 { 
 	clear_singlestep(child);
-	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 	clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
 }
 
diff --git a/trunk/arch/ia64/kernel/ptrace.c b/trunk/arch/ia64/kernel/ptrace.c
index 122444a97897..2e96f17b2f3b 100644
--- a/trunk/arch/ia64/kernel/ptrace.c
+++ b/trunk/arch/ia64/kernel/ptrace.c
@@ -1577,7 +1577,6 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
 
 	      case PTRACE_DETACH:
 		/* detach a process that was attached. */
-		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 		ret = ptrace_detach(child, data);
 		goto out_tsk;
 
diff --git a/trunk/arch/m68k/kernel/ptrace.c b/trunk/arch/m68k/kernel/ptrace.c
index 2cf0690b7882..e792d3cba4c7 100644
--- a/trunk/arch/m68k/kernel/ptrace.c
+++ b/trunk/arch/m68k/kernel/ptrace.c
@@ -116,7 +116,6 @@ static inline void singlestep_disable(struct task_struct *child)
 void ptrace_disable(struct task_struct *child)
 {
 	singlestep_disable(child);
-	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 }
 
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 82a558b655da..3eca7a55f2ee 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -233,6 +233,7 @@ int ptrace_detach(struct task_struct *child, unsigned int data)
 
 	/* Architecture-specific hardware disable .. */
 	ptrace_disable(child);
+	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 
 	write_lock_irq(&tasklist_lock);
 	/* protect against de_thread()->release_task() */