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

Commit 8313809e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

cris arch-v10: use generic ptrace_resume code 



Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and
PTRACE_KILL.  This also makes PTRACE_SINGLESTEP return -EIO while it
previously succeeded despite not actually causing any kind of single
stepping.

Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which
it previously wasn't which is consistent with all architectures using the
modern ptrace code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d75ca10

arch/cris/arch-v10/kernel/ptrace.c

+0 −51
Original line number Original line Diff line number Diff line
@@ -127,57 +127,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			ret = 0;

			ret = 0;

			break;

			break;





		case PTRACE_SYSCALL:

		case PTRACE_CONT:

			ret = -EIO;

			

			if (!valid_signal(data))

				break;

                        

			if (request == PTRACE_SYSCALL) {

				set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

			}

			else {

				clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

			}

			

			child->exit_code = data;

			

			/* TODO: make sure any pending breakpoint is killed */

			wake_up_process(child);

			ret = 0;

			

			break;

		

 		/* Make the child exit by sending it a sigkill. */

		case PTRACE_KILL:

			ret = 0;

			

			if (child->exit_state == EXIT_ZOMBIE)

				break;

			

			child->exit_code = SIGKILL;

			

			/* TODO: make sure any pending breakpoint is killed */

			wake_up_process(child);

			break;



		/* Set the trap flag. */

		case PTRACE_SINGLESTEP:

			ret = -EIO;

			

			if (!valid_signal(data))

				break;

			

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);



			/* TODO: set some clever breakpoint mechanism... */



			child->exit_code = data;

			wake_up_process(child);

			ret = 0;

			break;



		/* Get all GP registers from the child. */

		/* Get all GP registers from the child. */

		case PTRACE_GETREGS: {

		case PTRACE_GETREGS: {

		  	int i;

		  	int i;