aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m32r/kernel')
-rw-r--r--arch/m32r/kernel/process.c5
-rw-r--r--arch/m32r/kernel/ptrace.c5
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 3e876f0baebc..67a01e1e4283 100644
--- 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,
302 goto out; 302 goto out;
303 303
304 error = do_execve(filename, uargv, uenvp, &regs); 304 error = do_execve(filename, uargv, uenvp, &regs);
305 if (error == 0) {
306 task_lock(current);
307 current->ptrace &= ~PT_DTRACE;
308 task_unlock(current);
309 }
310 putname(filename); 305 putname(filename);
311out: 306out:
312 return error; 307 return error;
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c
index 9aa615d3a5b2..98b8feb12ed8 100644
--- a/arch/m32r/kernel/ptrace.c
+++ b/arch/m32r/kernel/ptrace.c
@@ -19,7 +19,6 @@
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/err.h> 20#include <linux/err.h>
21#include <linux/smp.h> 21#include <linux/smp.h>
22#include <linux/smp_lock.h>
23#include <linux/errno.h> 22#include <linux/errno.h>
24#include <linux/ptrace.h> 23#include <linux/ptrace.h>
25#include <linux/user.h> 24#include <linux/user.h>
@@ -676,10 +675,6 @@ arch_ptrace(struct task_struct *child, long request, long addr, long data)
676 if (!valid_signal(data)) 675 if (!valid_signal(data))
677 break; 676 break;
678 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); 677 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
679 if ((child->ptrace & PT_DTRACE) == 0) {
680 /* Spurious delayed TF traps may occur */
681 child->ptrace |= PT_DTRACE;
682 }
683 678
684 /* Compute next pc. */ 679 /* Compute next pc. */
685 pc = get_stack_long(child, PT_BPC); 680 pc = get_stack_long(child, PT_BPC);