unify sys_ptrace prototype
Subsystems (7)
PATCH 2/2 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 Christoph Hellwig <[email protected]>
arch/arm/kernel/ptrace.c +1 -1
@@ -782,7 +782,7 @@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
@@ -665,7 +665,7 @@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
@@ -106,7 +106,7 @@ 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
@@ -57,7 +57,7 @@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
@@ -354,7 +354,7 @@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 ;
arch/ia64/ia32/sys_ia32.c +1 -0
@@ -36,6 +36,7 @@#include <linux/uio.h> #include <linux/nfs_fs.h> #include <linux/quota.h> +#include <linux/syscalls.h> #include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h>
arch/m32r/kernel/ptrace.c +1 -1
@@ -756,7 +756,7 @@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/m68k/kernel/ptrace.c +1 -1
@@ -121,7 +121,7 @@ child->thread.work.syscall_trace =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;unsigned long tmp;
arch/m68knommu/kernel/ptrace.c +1 -1
@@ -101,7 +101,7 @@put_reg (child,PT_SR , tmp); } -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/mips/kernel/ptrace.c +1 -1
@@ -47,7 +47,7 @@/* Nothing to do.. */ } -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/ppc/kernel/ptrace.c +1 -1
@@ -240,7 +240,7 @@clear_single_step (child); } -int sys_ptrace (long request,long pid,long addr,long data) +long sys_ptrace (long request,long pid,long addr,long data) {struct task_struct *child;int ret = -EPERM ;
arch/ppc64/kernel/ptrace.c +1 -1
@@ -53,7 +53,7 @@clear_single_step (child); } -int sys_ptrace (long request,long pid,long addr,long data) +long sys_ptrace (long request,long pid,long addr,long data) {struct task_struct *child;int ret = -EPERM ;
arch/sh/kernel/ptrace.c +1 -1
@@ -80,7 +80,7 @@/* nothing to do.. */ } -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 ;
arch/sh64/kernel/ptrace.c +1 -1
@@ -121,7 +121,7 @@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;extern void poke_real_address_q (unsigned long long addr,unsigned long long data);
arch/v850/kernel/ptrace.c +1 -1
@@ -113,7 +113,7 @@return 1 ; } -int sys_ptrace (long request,long pid,long addr,long data) +long sys_ptrace (long request,long pid,long addr,long data) {struct task_struct *child;int rval;
arch/xtensa/kernel/ptrace.c +1 -1
@@ -45,7 +45,7 @@/* Nothing to do.. */ } -int sys_ptrace (long request,long pid,long addr,long data) +long sys_ptrace (long request,long pid,long addr,long data) {struct task_struct *child;int ret = -EPERM ;
include/asm-arm/unistd.h +0 -1
@@ -544,7 +544,6 @@ asmlinkage int sys_fork(struct pt_regs *regs); asmlinkage int sys_vfork(struct pt_regs *regs); asmlinkage int sys_pipe(unsigned long *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-arm26/unistd.h +0 -1
@@ -480,7 +480,6 @@ asmlinkage int sys_fork(struct pt_regs *regs); asmlinkage int sys_vfork(struct pt_regs *regs); asmlinkage int sys_pipe(unsigned long *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-cris/unistd.h +0 -1
@@ -367,7 +367,6 @@ asmlinkage int sys_vfork(long r10, long r11, long r12, long r13,long mof,long srp,struct pt_regs *regs); asmlinkage int sys_pipe(unsigned long __user *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-h8300/unistd.h +0 -1
@@ -528,7 +528,6 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp,int dummy, ...); asmlinkage int sys_pipe(unsigned long *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-i386/unistd.h +0 -1
@@ -448,7 +448,6 @@ asmlinkage int sys_fork(struct pt_regs regs); asmlinkage int sys_vfork(struct pt_regs regs); asmlinkage int sys_pipe(unsigned long __user *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);asmlinkage long sys_iopl (unsigned long unused);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig,
include/asm-ia64/unistd.h +0 -2
@@ -383,8 +383,6 @@long sys_execve (char __user *filename,char __user *__user *argv,char __user *__user *envp,struct pt_regs *regs);asmlinkage long sys_pipe (void ); -asmlinkage long sys_ptrace (long request,pid_t pid, -unsigned long addr,unsigned long data); asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act, struct sigaction __user *oact,
include/asm-m32r/unistd.h +0 -1
@@ -452,7 +452,6 @@ asmlinkage int sys_fork(struct pt_regs regs); asmlinkage int sys_vfork(struct pt_regs regs); asmlinkage int sys_pipe(unsigned long __user *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-m68k/unistd.h +0 -1
@@ -444,7 +444,6 @@ unsigned long fd, unsigned long pgoff); asmlinkage int sys_execve(char *name, char **argv, char **envp); asmlinkage int sys_pipe(unsigned long *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct pt_regs ;struct sigaction ; asmlinkage long sys_rt_sigaction(int sig,
include/asm-m68knommu/unistd.h +0 -1
@@ -504,7 +504,6 @@ unsigned long fd, unsigned long pgoff); asmlinkage int sys_execve(char *name, char **argv, char **envp); asmlinkage int sys_pipe(unsigned long *fildes); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct pt_regs ; int sys_request_irq(unsigned int, irqreturn_t (*)(int, void *, struct pt_regs *),
include/asm-mips/unistd.h +0 -1
@@ -1164,7 +1164,6 @@ unsigned long fd, unsigned long pgoff); asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs); asmlinkage int sys_pipe(nabi_no_regargs struct pt_regs regs); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-ppc/unistd.h +0 -1
@@ -469,7 +469,6 @@int sys_vfork (int p1,int p2,int p3,int p4,int p5,int p6,struct pt_regs *regs);int sys_pipe (int __user *fildes); -int sys_ptrace (long request,long pid,long addr,long data);struct sigaction ; long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-ppc64/unistd.h +0 -1
@@ -467,7 +467,6 @@ unsigned long p4, unsigned long p5, unsigned long p6, struct pt_regs *regs);int sys_pipe (int __user *fildes); -int sys_ptrace (long request,long pid,long addr,long data);struct sigaction ;long sys_rt_sigaction (int sig,const struct sigaction __user *act,struct sigaction __user *oact,size_t sigsetsize);
include/asm-s390/unistd.h +0 -1
@@ -590,7 +590,6 @@asmlinkage long sys_fork (struct pt_regs regs);asmlinkage long sys_vfork (struct pt_regs regs);asmlinkage long sys_pipe (unsigned long __user *fildes); -asmlinkage long sys_ptrace (long request,long pid,long addr,long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-sh/unistd.h +0 -1
@@ -503,7 +503,6 @@ asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,unsigned long r6,unsigned long r7,struct pt_regs regs); -asmlinkage int sys_ptrace(long request, long pid, long addr, long data); asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char *buf,size_t count,long dummy,loff_t pos); asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char *buf,
include/asm-v850/unistd.h +0 -1
@@ -452,7 +452,6 @@struct pt_regs ;int sys_execve (char *name,char **argv,char **envp,struct pt_regs *regs);int sys_pipe (int *fildes); -int sys_ptrace (long request,long pid,long addr,long data);struct sigaction ; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
include/asm-x86_64/unistd.h +0 -2
@@ -780,8 +780,6 @@#include <linux/types.h> #include <asm/ptrace.h> -asmlinkage long sys_ptrace (long request,long pid, -unsigned long addr,long data);asmlinkage long sys_iopl (unsigned int level,struct pt_regs *regs);asmlinkage long sys_ioperm (unsigned long from,unsigned long num,int turn_on);struct sigaction ;
include/linux/syscalls.h +1 -0
@@ -491,6 +491,7 @@asmlinkage long sys_syslog (int type,char __user *buf,int len);asmlinkage long sys_uselib (const char __user *library);asmlinkage long sys_ni_syscall (void ); +asmlinkage long sys_ptrace (long request,long pid,long addr,long data); asmlinkage long sys_add_key(const char __user *_type, const char __user *_description,