diff --git a/[refs] b/[refs] index a4bfebab770d..67cb1fca0fd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f68d2048206389603d646b06e3cc16f1bbc3ff88 +refs/heads/master: 41a2437eb1d175efe1958e283241a66a871dbdea diff --git a/trunk/arch/score/kernel/ptrace.c b/trunk/arch/score/kernel/ptrace.c index 894dcbf72099..55836188b217 100644 --- a/trunk/arch/score/kernel/ptrace.c +++ b/trunk/arch/score/kernel/ptrace.c @@ -336,14 +336,14 @@ arch_ptrace(struct task_struct *child, long request, ret = copy_regset_to_user(child, &user_score_native_view, REGSET_GENERAL, 0, sizeof(struct pt_regs), - (void __user *)datap); + datap); break; case PTRACE_SETREGS: ret = copy_regset_from_user(child, &user_score_native_view, REGSET_GENERAL, 0, sizeof(struct pt_regs), - (const void __user *)datap); + datap); break; default: