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

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

[PATCH] unify sys_ptrace prototype 



Make sure we always return, as all syscalls should.  Also move the common
prototype to <linux/syscalls.h>

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7024a9b8

arch/arm/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat 
	return ret;

}



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

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

{

	struct task_struct *child;

	int ret;

arch/arm26/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat 
	return ret;

}



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

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

{

	struct task_struct *child;

	int ret;

arch/frv/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void ptrace_enable(struct task_struct *child) 
	child->thread.frame0->__status |= REG__STATUS_STEP;

}



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

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

{

	struct task_struct *child;

	unsigned long tmp;

arch/h8300/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void ptrace_disable(struct task_struct *child) 
	h8300_disable_trace(child);

}



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

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

{

	struct task_struct *child;

	int ret;

arch/i386/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ ptrace_set_thread_area(struct task_struct *child, 
	return 0;

}



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

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

{

	struct task_struct *child;

	struct user * dummy = NULL;