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 'xen/dev-evtchn' into upstream/evtchn
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
ptrace.c
diff --git
a/arch/arm/kernel/ptrace.c
b/arch/arm/kernel/ptrace.c
index
e0cb637
..
3e97483
100644
(file)
--- a/
arch/arm/kernel/ptrace.c
+++ b/
arch/arm/kernel/ptrace.c
@@
-1075,13
+1075,15
@@
out:
}
#endif
}
#endif
-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;
+ unsigned long __user *datap = (unsigned long __user *) data;
switch (request) {
case PTRACE_PEEKUSR:
switch (request) {
case PTRACE_PEEKUSR:
- ret = ptrace_read_user(child, addr,
(unsigned long __user *)data
);
+ ret = ptrace_read_user(child, addr,
datap
);
break;
case PTRACE_POKEUSR:
break;
case PTRACE_POKEUSR:
@@
-1089,34
+1091,34
@@
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,
(void __user *)data
);
+ ret = ptrace_setregs(child,
datap
);
break;
case PTRACE_GETFPREGS:
break;
case PTRACE_GETFPREGS:
- ret = ptrace_getfpregs(child,
(void __user *)data
);
+ ret = ptrace_getfpregs(child,
datap
);
break;
case PTRACE_SETFPREGS:
break;
case PTRACE_SETFPREGS:
- ret = ptrace_setfpregs(child,
(void __user *)data
);
+ ret = ptrace_setfpregs(child,
datap
);
break;
#ifdef CONFIG_IWMMXT
case PTRACE_GETWMMXREGS:
break;
#ifdef CONFIG_IWMMXT
case PTRACE_GETWMMXREGS:
- ret = ptrace_getwmmxregs(child,
(void __user *)data
);
+ ret = ptrace_getwmmxregs(child,
datap
);
break;
case PTRACE_SETWMMXREGS:
break;
case PTRACE_SETWMMXREGS:
- ret = ptrace_setwmmxregs(child,
(void __user *)data
);
+ ret = ptrace_setwmmxregs(child,
datap
);
break;
#endif
case PTRACE_GET_THREAD_AREA:
ret = put_user(task_thread_info(child)->tp_value,
break;
#endif
case PTRACE_GET_THREAD_AREA:
ret = put_user(task_thread_info(child)->tp_value,
-
(unsigned long __user *) data
);
+
datap
);
break;
case PTRACE_SET_SYSCALL:
break;
case PTRACE_SET_SYSCALL:
@@
-1126,21
+1128,21
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
#ifdef CONFIG_CRUNCH
case PTRACE_GETCRUNCHREGS:
#ifdef CONFIG_CRUNCH
case PTRACE_GETCRUNCHREGS:
- ret = ptrace_getcrunchregs(child,
(void __user *)data
);
+ ret = ptrace_getcrunchregs(child,
datap
);
break;
case PTRACE_SETCRUNCHREGS:
break;
case PTRACE_SETCRUNCHREGS:
- ret = ptrace_setcrunchregs(child,
(void __user *)data
);
+ ret = ptrace_setcrunchregs(child,
datap
);
break;
#endif
#ifdef CONFIG_VFP
case PTRACE_GETVFPREGS:
break;
#endif
#ifdef CONFIG_VFP
case PTRACE_GETVFPREGS:
- ret = ptrace_getvfpregs(child,
(void __user *)data
);
+ ret = ptrace_getvfpregs(child,
datap
);
break;
case PTRACE_SETVFPREGS:
break;
case PTRACE_SETVFPREGS:
- ret = ptrace_setvfpregs(child,
(void __user *)data
);
+ ret = ptrace_setvfpregs(child,
datap
);
break;
#endif
break;
#endif