Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6-omap-h63xx.git] / arch / cris / arch-v10 / kernel / ptrace.c

diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c
index b570ae9b6cad22396e987508b3bfc3f38d61659f..ee505b2eb4dbfafc8860c972342033e5ad78a858 100644 (file)
--- a/arch/cris/arch-v10/kernel/ptrace.c
+++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -65,6 +65,7 @@ void
 ptrace_disable(struct task_struct *child)
 {
        /* Todo - pending singlesteps? */
+       clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 }
 
 /*