Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6-omap-h63xx.git] / arch / sh / kernel / ptrace_32.c

diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index ce0664a58b49c1e0ca4096a3a875679aa38bafae..fddb547f3c2b90f1483a9b54e4104701dc7eae8a 100644 (file)
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -220,7 +220,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                dp = ((unsigned long) child) + THREAD_SIZE -
                         sizeof(struct pt_dspregs);
                if (*((int *) (dp - 4)) == SR_FD) {
-                       copy_to_user(addr, (void *) dp,
+                       copy_to_user((void *)addr, (void *) dp,
                                sizeof(struct pt_dspregs));
                        ret = 0;
                }
@@ -234,7 +234,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                dp = ((unsigned long) child) + THREAD_SIZE -
                         sizeof(struct pt_dspregs);
                if (*((int *) (dp - 4)) == SR_FD) {
-                       copy_from_user((void *) dp, addr,
+                       copy_from_user((void *) dp, (void *)addr,
                                sizeof(struct pt_dspregs));
                        ret = 0;
                }