git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
[pandora-kernel.git]
/
arch
/
avr32
/
kernel
/
ptrace.c
diff --git
a/arch/avr32/kernel/ptrace.c
b/arch/avr32/kernel/ptrace.c
index
5e73c25
..
4aedcab
100644
(file)
--- a/
arch/avr32/kernel/ptrace.c
+++ b/
arch/avr32/kernel/ptrace.c
@@
-146,9
+146,11
@@
static int ptrace_setregs(struct task_struct *tsk, const void __user *uregs)
return ret;
}
return ret;
}
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request,
+ unsigned long addr, unsigned long data)
{
int ret;
{
int ret;
+ void __user *datap = (void __user *) data;
switch (request) {
/* Read the word at location addr in the child process */
switch (request) {
/* Read the word at location addr in the child process */
@@
-158,8
+160,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break;
case PTRACE_PEEKUSR:
break;
case PTRACE_PEEKUSR:
- ret = ptrace_read_user(child, addr,
- (unsigned long __user *)data);
+ ret = ptrace_read_user(child, addr, datap);
break;
/* Write the word in data at location addr */
break;
/* Write the word in data at location addr */
@@
-173,11
+174,11
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break;
case PTRACE_GETREGS:
break;
case PTRACE_GETREGS:
- ret = ptrace_getregs(child,
(void __user *)data
);
+ ret = ptrace_getregs(child,
datap
);
break;
case PTRACE_SETREGS:
break;
case PTRACE_SETREGS:
- ret = ptrace_setregs(child,
(const void __user *)data
);
+ ret = ptrace_setregs(child,
datap
);
break;
default:
break;
default: