aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2010-10-27 18:33:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 21:03:10 -0400
commit9b05a69e0534ec70bc94921936ffa05b330507cb (patch)
tree4116a7b7db286edf9486a29a7742d47fa67baa68 /arch/m68knommu
parent9fed81dc40f5a1ac2783bcc78d4029873be72894 (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/m68knommu')
-rw-r--r--arch/m68knommu/kernel/ptrace.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c
index 6fe7c38cd556..7dbb08f5534e 100644
--- a/arch/m68knommu/kernel/ptrace.c
+++ b/arch/m68knommu/kernel/ptrace.c
@@ -112,7 +112,8 @@ void ptrace_disable(struct task_struct *child)
112 user_disable_single_step(child); 112 user_disable_single_step(child);
113} 113}
114 114
115long arch_ptrace(struct task_struct *child, long request, long addr, long data) 115long arch_ptrace(struct task_struct *child, long request,
116 unsigned long addr, unsigned long data)
116{ 117{
117 int ret; 118 int ret;
118 119
@@ -184,7 +185,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
184 ret = -EFAULT; 185 ret = -EFAULT;
185 break; 186 break;
186 } 187 }
187 data += sizeof(long); 188 data += sizeof(unsigned long);
188 } 189 }
189 ret = 0; 190 ret = 0;
190 break; 191 break;
@@ -204,7 +205,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
204 tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16); 205 tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
205 } 206 }
206 put_reg(child, i, tmp); 207 put_reg(child, i, tmp);
207 data += sizeof(long); 208 data += sizeof(unsigned long);
208 } 209 }
209 ret = 0; 210 ret = 0;
210 break; 211 break;