diff options
| author |   Paul Mackerras <paulus@samba.org> | 2008-03-25 13:31:46 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 13:31:46 +1100 |
| commit | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (patch) | |
| tree | ae3083a50c55f1e1a2c83f475d0e8bb2da8d7196 /arch/sparc64/kernel/sys_sparc32.c | |
| parent | [POWERPC] mpc5200: Fix incorrect compatible string for the mdio node (diff) | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| download | linux-dev-16fddf5457d2a7eb5e96ceb016a8f722eca97af6.tar.xz linux-dev-16fddf5457d2a7eb5e96ceb016a8f722eca97af6.zip | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/sparc64/kernel/sys_sparc32.c')
| -rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 3 |
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; |