Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218547
b: refs/heads/master
c: a68caa0
h: refs/heads/master
i:
  218545: 853ede7
  218543: 018b209
v: v3
  • Loading branch information
Namhyung Kim authored and Linus Torvalds committed Oct 28, 2010
1 parent c30e3ad commit ddceda7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 05fabdace41837a21f957507378b2954fe87ab61
refs/heads/master: a68caa035a0ffb895baa829edec0545f17d88c07
8 changes: 4 additions & 4 deletions trunk/arch/m32r/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
/*
Expand All @@ -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;

/*
Expand All @@ -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:
Expand Down

0 comments on commit ddceda7

Please sign in to comment.