diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/arm26/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/frv/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/h8300/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/i386/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 1 | ||||
-rw-r--r-- | arch/m32r/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/m68knommu/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/ppc/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/sh64/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/um/include/sysdep-i386/syscalls.h | 1 | ||||
-rw-r--r-- | arch/v850/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/ptrace.c | 2 |
17 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index cd99b83f14c2..9bd8609a2926 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c | |||
@@ -782,7 +782,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat | |||
782 | return ret; | 782 | return ret; |
783 | } | 783 | } |
784 | 784 | ||
785 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 785 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
786 | { | 786 | { |
787 | struct task_struct *child; | 787 | struct task_struct *child; |
788 | int ret; | 788 | int ret; |
diff --git a/arch/arm26/kernel/ptrace.c b/arch/arm26/kernel/ptrace.c index 8a52124de0e1..cf7e977d18c8 100644 --- a/arch/arm26/kernel/ptrace.c +++ b/arch/arm26/kernel/ptrace.c | |||
@@ -665,7 +665,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat | |||
665 | return ret; | 665 | return ret; |
666 | } | 666 | } |
667 | 667 | ||
668 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 668 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
669 | { | 669 | { |
670 | struct task_struct *child; | 670 | struct task_struct *child; |
671 | int ret; | 671 | int ret; |
diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c index cbe03cba9f02..cb335a14a315 100644 --- a/arch/frv/kernel/ptrace.c +++ b/arch/frv/kernel/ptrace.c | |||
@@ -106,7 +106,7 @@ void ptrace_enable(struct task_struct *child) | |||
106 | child->thread.frame0->__status |= REG__STATUS_STEP; | 106 | child->thread.frame0->__status |= REG__STATUS_STEP; |
107 | } | 107 | } |
108 | 108 | ||
109 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 109 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
110 | { | 110 | { |
111 | struct task_struct *child; | 111 | struct task_struct *child; |
112 | unsigned long tmp; | 112 | unsigned long tmp; |
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c index 05c15e869777..a569fe4aa284 100644 --- a/arch/h8300/kernel/ptrace.c +++ b/arch/h8300/kernel/ptrace.c | |||
@@ -57,7 +57,7 @@ void ptrace_disable(struct task_struct *child) | |||
57 | h8300_disable_trace(child); | 57 | h8300_disable_trace(child); |
58 | } | 58 | } |
59 | 59 | ||
60 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 60 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
61 | { | 61 | { |
62 | struct task_struct *child; | 62 | struct task_struct *child; |
63 | int ret; | 63 | int ret; |
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index 7b6368bf8974..efd11f09c996 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c | |||
@@ -354,7 +354,7 @@ ptrace_set_thread_area(struct task_struct *child, | |||
354 | return 0; | 354 | return 0; |
355 | } | 355 | } |
356 | 356 | ||
357 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 357 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
358 | { | 358 | { |
359 | struct task_struct *child; | 359 | struct task_struct *child; |
360 | struct user * dummy = NULL; | 360 | struct user * dummy = NULL; |
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 3fa67ecebc83..dc282710421a 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/uio.h> | 36 | #include <linux/uio.h> |
37 | #include <linux/nfs_fs.h> | 37 | #include <linux/nfs_fs.h> |
38 | #include <linux/quota.h> | 38 | #include <linux/quota.h> |
39 | #include <linux/syscalls.h> | ||
39 | #include <linux/sunrpc/svc.h> | 40 | #include <linux/sunrpc/svc.h> |
40 | #include <linux/nfsd/nfsd.h> | 41 | #include <linux/nfsd/nfsd.h> |
41 | #include <linux/nfsd/cache.h> | 42 | #include <linux/nfsd/cache.h> |
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c index 124f7c1b775e..078d2a0e71c2 100644 --- a/arch/m32r/kernel/ptrace.c +++ b/arch/m32r/kernel/ptrace.c | |||
@@ -756,7 +756,7 @@ do_ptrace(long request, struct task_struct *child, long addr, long data) | |||
756 | return ret; | 756 | return ret; |
757 | } | 757 | } |
758 | 758 | ||
759 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 759 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
760 | { | 760 | { |
761 | struct task_struct *child; | 761 | struct task_struct *child; |
762 | int ret; | 762 | int ret; |
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 8ed1b01a6a87..f7f1d2e5b90b 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c | |||
@@ -121,7 +121,7 @@ void ptrace_disable(struct task_struct *child) | |||
121 | child->thread.work.syscall_trace = 0; | 121 | child->thread.work.syscall_trace = 0; |
122 | } | 122 | } |
123 | 123 | ||
124 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 124 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
125 | { | 125 | { |
126 | struct task_struct *child; | 126 | struct task_struct *child; |
127 | unsigned long tmp; | 127 | unsigned long tmp; |
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c index 9724e1cd82e5..621d7b91ccfe 100644 --- a/arch/m68knommu/kernel/ptrace.c +++ b/arch/m68knommu/kernel/ptrace.c | |||
@@ -101,7 +101,7 @@ void ptrace_disable(struct task_struct *child) | |||
101 | put_reg(child, PT_SR, tmp); | 101 | put_reg(child, PT_SR, tmp); |
102 | } | 102 | } |
103 | 103 | ||
104 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 104 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
105 | { | 105 | { |
106 | struct task_struct *child; | 106 | struct task_struct *child; |
107 | int ret; | 107 | int ret; |
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index fcceab8f2e00..f1b0f3e1f95b 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c | |||
@@ -174,7 +174,7 @@ int ptrace_setfpregs (struct task_struct *child, __u32 __user *data) | |||
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
176 | 176 | ||
177 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 177 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
178 | { | 178 | { |
179 | struct task_struct *child; | 179 | struct task_struct *child; |
180 | int ret; | 180 | int ret; |
diff --git a/arch/ppc/kernel/ptrace.c b/arch/ppc/kernel/ptrace.c index e7aee4108dea..e2744b6879da 100644 --- a/arch/ppc/kernel/ptrace.c +++ b/arch/ppc/kernel/ptrace.c | |||
@@ -240,7 +240,7 @@ void ptrace_disable(struct task_struct *child) | |||
240 | clear_single_step(child); | 240 | clear_single_step(child); |
241 | } | 241 | } |
242 | 242 | ||
243 | int sys_ptrace(long request, long pid, long addr, long data) | 243 | long sys_ptrace(long request, long pid, long addr, long data) |
244 | { | 244 | { |
245 | struct task_struct *child; | 245 | struct task_struct *child; |
246 | int ret = -EPERM; | 246 | int ret = -EPERM; |
diff --git a/arch/ppc64/kernel/ptrace.c b/arch/ppc64/kernel/ptrace.c index b1c044ca5756..b33073c31724 100644 --- a/arch/ppc64/kernel/ptrace.c +++ b/arch/ppc64/kernel/ptrace.c | |||
@@ -53,7 +53,7 @@ void ptrace_disable(struct task_struct *child) | |||
53 | clear_single_step(child); | 53 | clear_single_step(child); |
54 | } | 54 | } |
55 | 55 | ||
56 | int sys_ptrace(long request, long pid, long addr, long data) | 56 | long sys_ptrace(long request, long pid, long addr, long data) |
57 | { | 57 | { |
58 | struct task_struct *child; | 58 | struct task_struct *child; |
59 | int ret = -EPERM; | 59 | int ret = -EPERM; |
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index b28919b65682..1fbe5a428e31 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c | |||
@@ -80,7 +80,7 @@ void ptrace_disable(struct task_struct *child) | |||
80 | /* nothing to do.. */ | 80 | /* nothing to do.. */ |
81 | } | 81 | } |
82 | 82 | ||
83 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 83 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
84 | { | 84 | { |
85 | struct task_struct *child; | 85 | struct task_struct *child; |
86 | struct user * dummy = NULL; | 86 | struct user * dummy = NULL; |
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c index fd2000956dae..71f2eec00b99 100644 --- a/arch/sh64/kernel/ptrace.c +++ b/arch/sh64/kernel/ptrace.c | |||
@@ -121,7 +121,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data) | |||
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
123 | 123 | ||
124 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 124 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
125 | { | 125 | { |
126 | struct task_struct *child; | 126 | struct task_struct *child; |
127 | extern void poke_real_address_q(unsigned long long addr, unsigned long long data); | 127 | extern void poke_real_address_q(unsigned long long addr, unsigned long long data); |
diff --git a/arch/um/include/sysdep-i386/syscalls.h b/arch/um/include/sysdep-i386/syscalls.h index a0d5b74d3731..57bd79efbee3 100644 --- a/arch/um/include/sysdep-i386/syscalls.h +++ b/arch/um/include/sysdep-i386/syscalls.h | |||
@@ -11,7 +11,6 @@ typedef long syscall_handler_t(struct pt_regs); | |||
11 | /* Not declared on x86, incompatible declarations on x86_64, so these have | 11 | /* Not declared on x86, incompatible declarations on x86_64, so these have |
12 | * to go here rather than in sys_call_table.c | 12 | * to go here rather than in sys_call_table.c |
13 | */ | 13 | */ |
14 | extern syscall_handler_t sys_ptrace; | ||
15 | extern syscall_handler_t sys_rt_sigaction; | 14 | extern syscall_handler_t sys_rt_sigaction; |
16 | 15 | ||
17 | extern syscall_handler_t old_mmap_i386; | 16 | extern syscall_handler_t old_mmap_i386; |
diff --git a/arch/v850/kernel/ptrace.c b/arch/v850/kernel/ptrace.c index 4726b87f5e5a..d6077ff47d22 100644 --- a/arch/v850/kernel/ptrace.c +++ b/arch/v850/kernel/ptrace.c | |||
@@ -113,7 +113,7 @@ static int set_single_step (struct task_struct *t, int val) | |||
113 | return 1; | 113 | return 1; |
114 | } | 114 | } |
115 | 115 | ||
116 | int sys_ptrace(long request, long pid, long addr, long data) | 116 | long sys_ptrace(long request, long pid, long addr, long data) |
117 | { | 117 | { |
118 | struct task_struct *child; | 118 | struct task_struct *child; |
119 | int rval; | 119 | int rval; |
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 2659efdd4e99..14460743de07 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c | |||
@@ -45,7 +45,7 @@ void ptrace_disable(struct task_struct *child) | |||
45 | /* Nothing to do.. */ | 45 | /* Nothing to do.. */ |
46 | } | 46 | } |
47 | 47 | ||
48 | int sys_ptrace(long request, long pid, long addr, long data) | 48 | long sys_ptrace(long request, long pid, long addr, long data) |
49 | { | 49 | { |
50 | struct task_struct *child; | 50 | struct task_struct *child; |
51 | int ret = -EPERM; | 51 | int ret = -EPERM; |