Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48597760 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

ptrace: remove PT_DTRACE from arch/m32r 



m32r: PTRACE_SINGLESTEP sets PT_DTRACE, it is never used except cleared
after do_execve().

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d35f846

arch/m32r/kernel/process.c

+0 −5
Original line number Diff line number Diff line
@@ -302,11 +302,6 @@ asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, 
		goto out;



	error = do_execve(filename, uargv, uenvp, &regs);

	if (error == 0) {

		task_lock(current);

		current->ptrace &= ~PT_DTRACE;

		task_unlock(current);

	}

	putname(filename);

out:

	return error;

arch/m32r/kernel/ptrace.c

+0 −4
Original line number Diff line number Diff line
@@ -676,10 +676,6 @@ arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		if (!valid_signal(data))

			break;

		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		if ((child->ptrace & PT_DTRACE) == 0) {

			/* Spurious delayed TF traps may occur */

			child->ptrace |= PT_DTRACE;

		}



		/* Compute next pc.  */

		pc = get_stack_long(child, PT_BPC);