Commit 941af343 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] use generic sys_ptrace 



After the PT_IEEE_IP hack has been removed s390 can now use
the common code sys_ptrace function.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 613e1def

arch/s390/kernel/ptrace.c

+1 −36
Original line number Diff line number Diff line
@@ -607,18 +607,8 @@ do_ptrace_emu31(struct task_struct *child, long request, long addr, long data) 
}

#endif



static int

do_ptrace(struct task_struct *child, long request, long addr, long data)

long arch_ptrace(struct task_struct *child, long request, long addr, long data)

{

	int ret;



	if (request == PTRACE_ATTACH)

		return ptrace_attach(child);



	ret = ptrace_check_attach(child, request == PTRACE_KILL);

	if (ret < 0)

		return ret;



	switch (request) {

	case PTRACE_SYSCALL:

		/* continue and stop at next (return from) syscall */
@@ -673,31 +663,6 @@ do_ptrace(struct task_struct *child, long request, long addr, long data) 
	return -EIO;

}



asmlinkage long

sys_ptrace(long request, long pid, long addr, long data)

{

	struct task_struct *child;

	int ret;



	lock_kernel();

	if (request == PTRACE_TRACEME) {

		 ret = ptrace_traceme();

		 goto out;

	}



	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out;

	}



	ret = do_ptrace(child, request, addr, data);

	put_task_struct(child);

out:

	unlock_kernel();

	return ret;

}



asmlinkage void

syscall_trace(struct pt_regs *regs, int entryexit)

{

include/asm-s390/ptrace.h

+0 −2
Original line number Diff line number Diff line
@@ -463,8 +463,6 @@ struct user_regs_struct 
};



#ifdef __KERNEL__

#define __ARCH_SYS_PTRACE	1



/*

 * These are defined as per linux/ptrace.h, which see.

 */