From: Namhyung Kim <namhyung@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Roland McGrath <roland@redhat.com>,
Oleg Nesterov <oleg@redhat.com>,
linux-kernel@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>
Subject: [PATCH RESEND v3 18/24] ptrace: cleanup arch_ptrace() on powerpc
Date: Thu, 30 Sep 2010 18:27:53 +0900 [thread overview]
Message-ID: <1285838880-4977-19-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1285838880-4977-1-git-send-email-namhyung@gmail.com>
Use new 'datavp' and 'datalp' variables in order to remove unnecessary
castings.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
---
arch/powerpc/kernel/ptrace.c | 51 +++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index e4b6d75..8d5301c 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -1409,26 +1409,28 @@ static long ppc_del_hwdebug(struct task_struct *child, long addr, long data)
static long arch_ptrace_old(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
+ void __user *datavp = (void __user *) data;
+
switch (request) {
case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
return copy_regset_to_user(child, &user_ppc_native_view,
REGSET_GPR, 0, 32 * sizeof(long),
- (void __user *) data);
+ datavp);
case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_GPR, 0, 32 * sizeof(long),
- (const void __user *) data);
+ datavp);
case PPC_PTRACE_GETFPREGS: /* Get FPRs 0 - 31. */
return copy_regset_to_user(child, &user_ppc_native_view,
REGSET_FPR, 0, 32 * sizeof(double),
- (void __user *) data);
+ datavp);
case PPC_PTRACE_SETFPREGS: /* Set FPRs 0 - 31. */
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_FPR, 0, 32 * sizeof(double),
- (const void __user *) data);
+ datavp);
}
return -EPERM;
@@ -1438,6 +1440,8 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret = -EPERM;
+ void __user *datavp = (void __user *) data;
+ unsigned long __user *datalp = datavp;
switch (request) {
/* read the word at location addr in the USER area. */
@@ -1464,7 +1468,7 @@ long arch_ptrace(struct task_struct *child, long request,
tmp = ((unsigned long *)child->thread.fpr)
[TS_FPRWIDTH * (index - PT_FPR0)];
}
- ret = put_user(tmp,(unsigned long __user *) data);
+ ret = put_user(tmp, datalp);
break;
}
@@ -1526,11 +1530,11 @@ long arch_ptrace(struct task_struct *child, long request,
dbginfo.features = 0;
#endif /* CONFIG_PPC_ADV_DEBUG_REGS */
- if (!access_ok(VERIFY_WRITE, data,
+ if (!access_ok(VERIFY_WRITE, datavp,
sizeof(struct ppc_debug_info)))
return -EFAULT;
- ret = __copy_to_user((struct ppc_debug_info __user *)data,
- &dbginfo, sizeof(struct ppc_debug_info)) ?
+ ret = __copy_to_user(datavp, &dbginfo,
+ sizeof(struct ppc_debug_info)) ?
-EFAULT : 0;
break;
}
@@ -1538,11 +1542,10 @@ long arch_ptrace(struct task_struct *child, long request,
case PPC_PTRACE_SETHWDEBUG: {
struct ppc_hw_breakpoint bp_info;
- if (!access_ok(VERIFY_READ, data,
+ if (!access_ok(VERIFY_READ, datavp,
sizeof(struct ppc_hw_breakpoint)))
return -EFAULT;
- ret = __copy_from_user(&bp_info,
- (struct ppc_hw_breakpoint __user *)data,
+ ret = __copy_from_user(&bp_info, datavp,
sizeof(struct ppc_hw_breakpoint)) ?
-EFAULT : 0;
if (!ret)
@@ -1561,11 +1564,9 @@ long arch_ptrace(struct task_struct *child, long request,
if (addr > 0)
break;
#ifdef CONFIG_PPC_ADV_DEBUG_REGS
- ret = put_user(child->thread.dac1,
- (unsigned long __user *)data);
+ ret = put_user(child->thread.dac1, datalp);
#else
- ret = put_user(child->thread.dabr,
- (unsigned long __user *)data);
+ ret = put_user(child->thread.dabr, datalp);
#endif
break;
}
@@ -1581,7 +1582,7 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_to_user(child, &user_ppc_native_view,
REGSET_GPR,
0, sizeof(struct pt_regs),
- (void __user *) data);
+ datavp);
#ifdef CONFIG_PPC64
case PTRACE_SETREGS64:
@@ -1590,19 +1591,19 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_GPR,
0, sizeof(struct pt_regs),
- (const void __user *) data);
+ datavp);
case PTRACE_GETFPREGS: /* Get the child FPU state (FPR0...31 + FPSCR) */
return copy_regset_to_user(child, &user_ppc_native_view,
REGSET_FPR,
0, sizeof(elf_fpregset_t),
- (void __user *) data);
+ datavp);
case PTRACE_SETFPREGS: /* Set the child FPU state (FPR0...31 + FPSCR) */
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_FPR,
0, sizeof(elf_fpregset_t),
- (const void __user *) data);
+ datavp);
#ifdef CONFIG_ALTIVEC
case PTRACE_GETVRREGS:
@@ -1610,40 +1611,40 @@ long arch_ptrace(struct task_struct *child, long request,
REGSET_VMX,
0, (33 * sizeof(vector128) +
sizeof(u32)),
- (void __user *) data);
+ datavp);
case PTRACE_SETVRREGS:
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_VMX,
0, (33 * sizeof(vector128) +
sizeof(u32)),
- (const void __user *) data);
+ datavp);
#endif
#ifdef CONFIG_VSX
case PTRACE_GETVSRREGS:
return copy_regset_to_user(child, &user_ppc_native_view,
REGSET_VSX,
0, 32 * sizeof(double),
- (void __user *) data);
+ datavp);
case PTRACE_SETVSRREGS:
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_VSX,
0, 32 * sizeof(double),
- (const void __user *) data);
+ datavp);
#endif
#ifdef CONFIG_SPE
case PTRACE_GETEVRREGS:
/* Get the child spe register state. */
return copy_regset_to_user(child, &user_ppc_native_view,
REGSET_SPE, 0, 35 * sizeof(u32),
- (void __user *) data);
+ datavp);
case PTRACE_SETEVRREGS:
/* Set the child spe register state. */
return copy_regset_from_user(child, &user_ppc_native_view,
REGSET_SPE, 0, 35 * sizeof(u32),
- (const void __user *) data);
+ datavp);
#endif
/* Old reverse args ptrace callss */
--
1.7.2.2
next prev parent reply other threads:[~2010-09-30 9:29 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 9:27 [PATCH RESEND v3 00/24] ptrace cleanups Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 01/24] ptrace: change signature of sys_ptrace() and friends Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 02/24] ptrace: cleanup ptrace_request() Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 03/24] ptrace: change signature of arch_ptrace() Namhyung Kim
2010-09-30 18:58 ` David Miller
2010-10-04 19:21 ` Geert Uytterhoeven
2010-09-30 9:27 ` [PATCH RESEND v3 04/24] ptrace: cleanup arch_ptrace() on x86 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 05/24] ptrace: cleanup arch_ptrace() on ARM Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 06/24] ptrace: cleanup arch_ptrace() on avr32 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 07/24] ptrace: cleanup arch_ptrace() and friends on Blackfin Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 08/24] ptrace: cleanup arch_ptrace() on cris Namhyung Kim
2010-09-30 10:36 ` Mikael Starvik
2010-09-30 9:27 ` [PATCH RESEND v3 09/24] ptrace: cleanup arch_ptrace() on frv Namhyung Kim
2010-10-02 3:18 ` Daniel K.
2010-10-02 3:57 ` Namhyung Kim
2010-10-02 4:59 ` Namhyung Kim
2010-10-02 6:13 ` Daniel K.
2010-09-30 9:27 ` [PATCH RESEND v3 10/24] ptrace: cleanup arch_ptrace() on h8300 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 11/24] ptrace: cleanup arch_ptrace() on m32r Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 12/24] ptrace: cleanup arch_ptrace() on m68k Namhyung Kim
2010-10-04 19:22 ` Geert Uytterhoeven
2010-09-30 9:27 ` [PATCH RESEND v3 13/24] ptrace: cleanup arch_ptrace() on m68knommu Namhyung Kim
2010-10-04 23:42 ` Andrew Morton
2010-10-05 3:49 ` [PATCH UPDATED] " Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 14/24] ptrace: cleanup arch_ptrace() on microblaze Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 15/24] ptrace: cleanup arch_ptrace() on MIPS Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 16/24] ptrace: cleanup arch_ptrace() on mn10300 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 17/24] ptrace: cleanup arch_ptrace() on parisc Namhyung Kim
2010-09-30 9:27 ` Namhyung Kim [this message]
2010-09-30 9:27 ` [PATCH RESEND v3 19/24] ptrace: cleanup arch_ptrace() on score Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 20/24] ptrace: cleanup arch_ptrace() on sh Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 21/24] ptrace: cleanup arch_ptrace() on sparc Namhyung Kim
2010-09-30 19:00 ` David Miller
2010-09-30 9:27 ` [PATCH RESEND v3 22/24] ptrace: cleanup arch_ptrace() on tile Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 23/24] ptrace: cleanup arch_ptrace() on um Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 24/24] ptrace: cleanup arch_ptrace() on xtensa Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285838880-4977-19-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=roland@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox