git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
process.c
diff --git
a/arch/m32r/kernel/process.c
b/arch/m32r/kernel/process.c
index
3e876f0
..
67a01e1
100644
(file)
--- a/
arch/m32r/kernel/process.c
+++ b/
arch/m32r/kernel/process.c
@@
-302,11
+302,6
@@
asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv,
goto out;
error = do_execve(filename, uargv, uenvp, ®s);
- if (error == 0) {
- task_lock(current);
- current->ptrace &= ~PT_DTRACE;
- task_unlock(current);
- }
putname(filename);
out:
return error;