From ddceda7a543379b2e86b42436d03a5bb804ae2e8 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Wed, 27 Oct 2010 15:33:54 -0700 Subject: [PATCH] --- yaml --- r: 218547 b: refs/heads/master c: a68caa035a0ffb895baa829edec0545f17d88c07 h: refs/heads/master i: 218545: 853ede76cc565e62af84e980c86a18b5031908f3 218543: 018b209ca7bd1a7e5e4bd8b6f8c8cc3ed85dc61e v: v3 --- [refs] | 2 +- trunk/arch/m32r/kernel/ptrace.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a745d087c90e..2c0dc893bcec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05fabdace41837a21f957507378b2954fe87ab61 +refs/heads/master: a68caa035a0ffb895baa829edec0545f17d88c07 diff --git a/trunk/arch/m32r/kernel/ptrace.c b/trunk/arch/m32r/kernel/ptrace.c index 5e00e0a41fff..20743754f2b2 100644 --- a/trunk/arch/m32r/kernel/ptrace.c +++ b/trunk/arch/m32r/kernel/ptrace.c @@ -626,6 +626,7 @@ arch_ptrace(struct task_struct *child, long request, unsigned long addr, unsigned long data) { int ret; + unsigned long __user *datap = (unsigned long __user *) data; switch (request) { /* @@ -640,8 +641,7 @@ arch_ptrace(struct task_struct *child, long request, * read the word at location addr in the USER area. */ case PTRACE_PEEKUSR: - ret = ptrace_read_user(child, addr, - (unsigned long __user *)data); + ret = ptrace_read_user(child, addr, datap); break; /* @@ -662,11 +662,11 @@ arch_ptrace(struct task_struct *child, long request, break; case PTRACE_GETREGS: - ret = ptrace_getregs(child, (void __user *)data); + ret = ptrace_getregs(child, datap); break; case PTRACE_SETREGS: - ret = ptrace_setregs(child, (void __user *)data); + ret = ptrace_setregs(child, datap); break; default: