diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-10-27 18:33:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:03:10 -0400 |
commit | 9b05a69e0534ec70bc94921936ffa05b330507cb (patch) | |
tree | 4116a7b7db286edf9486a29a7742d47fa67baa68 /arch/m68k | |
parent | 9fed81dc40f5a1ac2783bcc78d4029873be72894 (diff) |
ptrace: change signature of arch_ptrace()
Fix up the arguments to arch_ptrace() to take account of the fact that
@addr and @data are now unsigned long rather than long as of a preceding
patch in this series.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: <linux-arch@vger.kernel.org>
Acked-by: Roland McGrath <roland@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/kernel/ptrace.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 616e59752c29..583f59fcc363 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c | |||
@@ -156,7 +156,8 @@ void user_disable_single_step(struct task_struct *child) | |||
156 | singlestep_disable(child); | 156 | singlestep_disable(child); |
157 | } | 157 | } |
158 | 158 | ||
159 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 159 | long arch_ptrace(struct task_struct *child, long request, |
160 | unsigned long addr, unsigned long data) | ||
160 | { | 161 | { |
161 | unsigned long tmp; | 162 | unsigned long tmp; |
162 | int i, ret = 0; | 163 | int i, ret = 0; |
@@ -200,7 +201,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
200 | * into internal fpu reg representation | 201 | * into internal fpu reg representation |
201 | */ | 202 | */ |
202 | if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) { | 203 | if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) { |
203 | data = (unsigned long)data << 15; | 204 | data <<= 15; |
204 | data = (data & 0xffff0000) | | 205 | data = (data & 0xffff0000) | |
205 | ((data & 0x0000ffff) >> 1); | 206 | ((data & 0x0000ffff) >> 1); |
206 | } | 207 | } |
@@ -215,7 +216,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
215 | ret = put_user(tmp, (unsigned long *)data); | 216 | ret = put_user(tmp, (unsigned long *)data); |
216 | if (ret) | 217 | if (ret) |
217 | break; | 218 | break; |
218 | data += sizeof(long); | 219 | data += sizeof(unsigned long); |
219 | } | 220 | } |
220 | break; | 221 | break; |
221 | 222 | ||
@@ -229,7 +230,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
229 | tmp |= get_reg(child, PT_SR) & ~SR_MASK; | 230 | tmp |= get_reg(child, PT_SR) & ~SR_MASK; |
230 | } | 231 | } |
231 | put_reg(child, i, tmp); | 232 | put_reg(child, i, tmp); |
232 | data += sizeof(long); | 233 | data += sizeof(unsigned long); |
233 | } | 234 | } |
234 | break; | 235 | break; |
235 | 236 | ||