Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 0 insertions, 3 deletions

diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index deaba2bd0535..2455fa498876 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -678,9 +678,6 @@ asmlinkage long sparc32_execve(struct pt_regs *regs)
                 current_thread_info()->xfsr[0] = 0;
                 current_thread_info()->fpsaved[0] = 0;
                 regs->tstate &= ~TSTATE_PEF;
-                task_lock(current);
-                current->ptrace &= ~PT_DTRACE;
-                task_unlock(current);
         }
 out:
         return error;