diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-arm26/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-cris/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-h8300/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-i386/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-ia64/unistd.h | 2 | ||||
-rw-r--r-- | include/asm-m32r/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-m68knommu/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-mips/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-ppc/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-ppc64/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-s390/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-sh/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-v850/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-x86_64/unistd.h | 2 | ||||
-rw-r--r-- | include/linux/syscalls.h | 1 |
17 files changed, 1 insertions, 18 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index c49df635a80f..d626e70faded 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h | |||
@@ -544,7 +544,6 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, | |||
544 | asmlinkage int sys_fork(struct pt_regs *regs); | 544 | asmlinkage int sys_fork(struct pt_regs *regs); |
545 | asmlinkage int sys_vfork(struct pt_regs *regs); | 545 | asmlinkage int sys_vfork(struct pt_regs *regs); |
546 | asmlinkage int sys_pipe(unsigned long *fildes); | 546 | asmlinkage int sys_pipe(unsigned long *fildes); |
547 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
548 | struct sigaction; | 547 | struct sigaction; |
549 | asmlinkage long sys_rt_sigaction(int sig, | 548 | asmlinkage long sys_rt_sigaction(int sig, |
550 | const struct sigaction __user *act, | 549 | const struct sigaction __user *act, |
diff --git a/include/asm-arm26/unistd.h b/include/asm-arm26/unistd.h index dfa0b0c30aa3..be4c2fb9c049 100644 --- a/include/asm-arm26/unistd.h +++ b/include/asm-arm26/unistd.h | |||
@@ -480,7 +480,6 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, | |||
480 | asmlinkage int sys_fork(struct pt_regs *regs); | 480 | asmlinkage int sys_fork(struct pt_regs *regs); |
481 | asmlinkage int sys_vfork(struct pt_regs *regs); | 481 | asmlinkage int sys_vfork(struct pt_regs *regs); |
482 | asmlinkage int sys_pipe(unsigned long *fildes); | 482 | asmlinkage int sys_pipe(unsigned long *fildes); |
483 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
484 | struct sigaction; | 483 | struct sigaction; |
485 | asmlinkage long sys_rt_sigaction(int sig, | 484 | asmlinkage long sys_rt_sigaction(int sig, |
486 | const struct sigaction __user *act, | 485 | const struct sigaction __user *act, |
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h index 28232ad2ff34..156a34bfc583 100644 --- a/include/asm-cris/unistd.h +++ b/include/asm-cris/unistd.h | |||
@@ -367,7 +367,6 @@ asmlinkage int sys_fork(long r10, long r11, long r12, long r13, | |||
367 | asmlinkage int sys_vfork(long r10, long r11, long r12, long r13, | 367 | asmlinkage int sys_vfork(long r10, long r11, long r12, long r13, |
368 | long mof, long srp, struct pt_regs *regs); | 368 | long mof, long srp, struct pt_regs *regs); |
369 | asmlinkage int sys_pipe(unsigned long __user *fildes); | 369 | asmlinkage int sys_pipe(unsigned long __user *fildes); |
370 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
371 | struct sigaction; | 370 | struct sigaction; |
372 | asmlinkage long sys_rt_sigaction(int sig, | 371 | asmlinkage long sys_rt_sigaction(int sig, |
373 | const struct sigaction __user *act, | 372 | const struct sigaction __user *act, |
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h index 56a6401886fa..56a4a5686c88 100644 --- a/include/asm-h8300/unistd.h +++ b/include/asm-h8300/unistd.h | |||
@@ -528,7 +528,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | |||
528 | asmlinkage int sys_execve(char *name, char **argv, char **envp, | 528 | asmlinkage int sys_execve(char *name, char **argv, char **envp, |
529 | int dummy, ...); | 529 | int dummy, ...); |
530 | asmlinkage int sys_pipe(unsigned long *fildes); | 530 | asmlinkage int sys_pipe(unsigned long *fildes); |
531 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
532 | struct sigaction; | 531 | struct sigaction; |
533 | asmlinkage long sys_rt_sigaction(int sig, | 532 | asmlinkage long sys_rt_sigaction(int sig, |
534 | const struct sigaction __user *act, | 533 | const struct sigaction __user *act, |
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index fbaf90a3968c..0f92e78dfea1 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
@@ -448,7 +448,6 @@ asmlinkage int sys_clone(struct pt_regs regs); | |||
448 | asmlinkage int sys_fork(struct pt_regs regs); | 448 | asmlinkage int sys_fork(struct pt_regs regs); |
449 | asmlinkage int sys_vfork(struct pt_regs regs); | 449 | asmlinkage int sys_vfork(struct pt_regs regs); |
450 | asmlinkage int sys_pipe(unsigned long __user *fildes); | 450 | asmlinkage int sys_pipe(unsigned long __user *fildes); |
451 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
452 | asmlinkage long sys_iopl(unsigned long unused); | 451 | asmlinkage long sys_iopl(unsigned long unused); |
453 | struct sigaction; | 452 | struct sigaction; |
454 | asmlinkage long sys_rt_sigaction(int sig, | 453 | asmlinkage long sys_rt_sigaction(int sig, |
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 3a0c69524656..6d96a67439be 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
@@ -383,8 +383,6 @@ struct sigaction; | |||
383 | long sys_execve(char __user *filename, char __user * __user *argv, | 383 | long sys_execve(char __user *filename, char __user * __user *argv, |
384 | char __user * __user *envp, struct pt_regs *regs); | 384 | char __user * __user *envp, struct pt_regs *regs); |
385 | asmlinkage long sys_pipe(void); | 385 | asmlinkage long sys_pipe(void); |
386 | asmlinkage long sys_ptrace(long request, pid_t pid, | ||
387 | unsigned long addr, unsigned long data); | ||
388 | asmlinkage long sys_rt_sigaction(int sig, | 386 | asmlinkage long sys_rt_sigaction(int sig, |
389 | const struct sigaction __user *act, | 387 | const struct sigaction __user *act, |
390 | struct sigaction __user *oact, | 388 | struct sigaction __user *oact, |
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h index 8552d8f45ab1..ac399e1f7bc0 100644 --- a/include/asm-m32r/unistd.h +++ b/include/asm-m32r/unistd.h | |||
@@ -452,7 +452,6 @@ asmlinkage int sys_clone(struct pt_regs regs); | |||
452 | asmlinkage int sys_fork(struct pt_regs regs); | 452 | asmlinkage int sys_fork(struct pt_regs regs); |
453 | asmlinkage int sys_vfork(struct pt_regs regs); | 453 | asmlinkage int sys_vfork(struct pt_regs regs); |
454 | asmlinkage int sys_pipe(unsigned long __user *fildes); | 454 | asmlinkage int sys_pipe(unsigned long __user *fildes); |
455 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
456 | struct sigaction; | 455 | struct sigaction; |
457 | asmlinkage long sys_rt_sigaction(int sig, | 456 | asmlinkage long sys_rt_sigaction(int sig, |
458 | const struct sigaction __user *act, | 457 | const struct sigaction __user *act, |
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index cbabde4f8a45..c2554bcd1747 100644 --- a/include/asm-m68k/unistd.h +++ b/include/asm-m68k/unistd.h | |||
@@ -444,7 +444,6 @@ asmlinkage long sys_mmap2( | |||
444 | unsigned long fd, unsigned long pgoff); | 444 | unsigned long fd, unsigned long pgoff); |
445 | asmlinkage int sys_execve(char *name, char **argv, char **envp); | 445 | asmlinkage int sys_execve(char *name, char **argv, char **envp); |
446 | asmlinkage int sys_pipe(unsigned long *fildes); | 446 | asmlinkage int sys_pipe(unsigned long *fildes); |
447 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
448 | struct pt_regs; | 447 | struct pt_regs; |
449 | struct sigaction; | 448 | struct sigaction; |
450 | asmlinkage long sys_rt_sigaction(int sig, | 449 | asmlinkage long sys_rt_sigaction(int sig, |
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h index 84b6fa14459f..5373988a7e51 100644 --- a/include/asm-m68knommu/unistd.h +++ b/include/asm-m68knommu/unistd.h | |||
@@ -504,7 +504,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | |||
504 | unsigned long fd, unsigned long pgoff); | 504 | unsigned long fd, unsigned long pgoff); |
505 | asmlinkage int sys_execve(char *name, char **argv, char **envp); | 505 | asmlinkage int sys_execve(char *name, char **argv, char **envp); |
506 | asmlinkage int sys_pipe(unsigned long *fildes); | 506 | asmlinkage int sys_pipe(unsigned long *fildes); |
507 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
508 | struct pt_regs; | 507 | struct pt_regs; |
509 | int sys_request_irq(unsigned int, | 508 | int sys_request_irq(unsigned int, |
510 | irqreturn_t (*)(int, void *, struct pt_regs *), | 509 | irqreturn_t (*)(int, void *, struct pt_regs *), |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index c9eaf4c104de..89ea8b60e945 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
@@ -1177,7 +1177,6 @@ asmlinkage long sys_mmap2( | |||
1177 | unsigned long fd, unsigned long pgoff); | 1177 | unsigned long fd, unsigned long pgoff); |
1178 | asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs); | 1178 | asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs); |
1179 | asmlinkage int sys_pipe(nabi_no_regargs struct pt_regs regs); | 1179 | asmlinkage int sys_pipe(nabi_no_regargs struct pt_regs regs); |
1180 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
1181 | struct sigaction; | 1180 | struct sigaction; |
1182 | asmlinkage long sys_rt_sigaction(int sig, | 1181 | asmlinkage long sys_rt_sigaction(int sig, |
1183 | const struct sigaction __user *act, | 1182 | const struct sigaction __user *act, |
diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h index 3173ab3d2eb9..404c143e643d 100644 --- a/include/asm-ppc/unistd.h +++ b/include/asm-ppc/unistd.h | |||
@@ -469,7 +469,6 @@ int sys_fork(int p1, int p2, int p3, int p4, int p5, int p6, | |||
469 | int sys_vfork(int p1, int p2, int p3, int p4, int p5, int p6, | 469 | int sys_vfork(int p1, int p2, int p3, int p4, int p5, int p6, |
470 | struct pt_regs *regs); | 470 | struct pt_regs *regs); |
471 | int sys_pipe(int __user *fildes); | 471 | int sys_pipe(int __user *fildes); |
472 | int sys_ptrace(long request, long pid, long addr, long data); | ||
473 | struct sigaction; | 472 | struct sigaction; |
474 | long sys_rt_sigaction(int sig, | 473 | long sys_rt_sigaction(int sig, |
475 | const struct sigaction __user *act, | 474 | const struct sigaction __user *act, |
diff --git a/include/asm-ppc64/unistd.h b/include/asm-ppc64/unistd.h index 977bc980c1af..6b5fcbadbc5b 100644 --- a/include/asm-ppc64/unistd.h +++ b/include/asm-ppc64/unistd.h | |||
@@ -467,7 +467,6 @@ int sys_vfork(unsigned long p1, unsigned long p2, unsigned long p3, | |||
467 | unsigned long p4, unsigned long p5, unsigned long p6, | 467 | unsigned long p4, unsigned long p5, unsigned long p6, |
468 | struct pt_regs *regs); | 468 | struct pt_regs *regs); |
469 | int sys_pipe(int __user *fildes); | 469 | int sys_pipe(int __user *fildes); |
470 | int sys_ptrace(long request, long pid, long addr, long data); | ||
471 | struct sigaction; | 470 | struct sigaction; |
472 | long sys_rt_sigaction(int sig, const struct sigaction __user *act, | 471 | long sys_rt_sigaction(int sig, const struct sigaction __user *act, |
473 | struct sigaction __user *oact, size_t sigsetsize); | 472 | struct sigaction __user *oact, size_t sigsetsize); |
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index 221e965da924..f97d92691f17 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h | |||
@@ -590,7 +590,6 @@ asmlinkage long sys_clone(struct pt_regs regs); | |||
590 | asmlinkage long sys_fork(struct pt_regs regs); | 590 | asmlinkage long sys_fork(struct pt_regs regs); |
591 | asmlinkage long sys_vfork(struct pt_regs regs); | 591 | asmlinkage long sys_vfork(struct pt_regs regs); |
592 | asmlinkage long sys_pipe(unsigned long __user *fildes); | 592 | asmlinkage long sys_pipe(unsigned long __user *fildes); |
593 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data); | ||
594 | struct sigaction; | 593 | struct sigaction; |
595 | asmlinkage long sys_rt_sigaction(int sig, | 594 | asmlinkage long sys_rt_sigaction(int sig, |
596 | const struct sigaction __user *act, | 595 | const struct sigaction __user *act, |
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index ea89e8f223ea..f2c8e14d1fd9 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h | |||
@@ -503,7 +503,6 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, | |||
503 | asmlinkage int sys_pipe(unsigned long r4, unsigned long r5, | 503 | asmlinkage int sys_pipe(unsigned long r4, unsigned long r5, |
504 | unsigned long r6, unsigned long r7, | 504 | unsigned long r6, unsigned long r7, |
505 | struct pt_regs regs); | 505 | struct pt_regs regs); |
506 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data); | ||
507 | asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char *buf, | 506 | asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char *buf, |
508 | size_t count, long dummy, loff_t pos); | 507 | size_t count, long dummy, loff_t pos); |
509 | asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char *buf, | 508 | asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char *buf, |
diff --git a/include/asm-v850/unistd.h b/include/asm-v850/unistd.h index 3b552096c0e8..5a86f8e976ec 100644 --- a/include/asm-v850/unistd.h +++ b/include/asm-v850/unistd.h | |||
@@ -452,7 +452,6 @@ unsigned long sys_mmap2(unsigned long addr, size_t len, | |||
452 | struct pt_regs; | 452 | struct pt_regs; |
453 | int sys_execve (char *name, char **argv, char **envp, struct pt_regs *regs); | 453 | int sys_execve (char *name, char **argv, char **envp, struct pt_regs *regs); |
454 | int sys_pipe (int *fildes); | 454 | int sys_pipe (int *fildes); |
455 | int sys_ptrace(long request, long pid, long addr, long data); | ||
456 | struct sigaction; | 455 | struct sigaction; |
457 | asmlinkage long sys_rt_sigaction(int sig, | 456 | asmlinkage long sys_rt_sigaction(int sig, |
458 | const struct sigaction __user *act, | 457 | const struct sigaction __user *act, |
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 11ba931cf82f..3c494b65d33a 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h | |||
@@ -780,8 +780,6 @@ asmlinkage long sys_pipe(int *fildes); | |||
780 | #include <linux/types.h> | 780 | #include <linux/types.h> |
781 | #include <asm/ptrace.h> | 781 | #include <asm/ptrace.h> |
782 | 782 | ||
783 | asmlinkage long sys_ptrace(long request, long pid, | ||
784 | unsigned long addr, long data); | ||
785 | asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs); | 783 | asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs); |
786 | asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on); | 784 | asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on); |
787 | struct sigaction; | 785 | struct sigaction; |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index a6f03e473737..c7007b1db91d 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -491,6 +491,7 @@ asmlinkage long sys_nfsservctl(int cmd, | |||
491 | asmlinkage long sys_syslog(int type, char __user *buf, int len); | 491 | asmlinkage long sys_syslog(int type, char __user *buf, int len); |
492 | asmlinkage long sys_uselib(const char __user *library); | 492 | asmlinkage long sys_uselib(const char __user *library); |
493 | asmlinkage long sys_ni_syscall(void); | 493 | asmlinkage long sys_ni_syscall(void); |
494 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data); | ||
494 | 495 | ||
495 | asmlinkage long sys_add_key(const char __user *_type, | 496 | asmlinkage long sys_add_key(const char __user *_type, |
496 | const char __user *_description, | 497 | const char __user *_description, |