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
Pull cpuidle into release branch
[pandora-kernel.git]
/
arch
/
cris
/
arch-v10
/
kernel
/
ptrace.c
diff --git
a/arch/cris/arch-v10/kernel/ptrace.c
b/arch/cris/arch-v10/kernel/ptrace.c
index
961c0d5
..
b570ae9
100644
(file)
--- a/
arch/cris/arch-v10/kernel/ptrace.c
+++ b/
arch/cris/arch-v10/kernel/ptrace.c
@@
-6,7
+6,6
@@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/smp.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/errno.h>
#include <linux/ptrace.h>
#include <linux/user.h>
#include <linux/errno.h>
#include <linux/ptrace.h>
#include <linux/user.h>
@@
-84,19
+83,9
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
switch (request) {
/* Read word at location address. */
case PTRACE_PEEKTEXT:
switch (request) {
/* Read word at location address. */
case PTRACE_PEEKTEXT:
- case PTRACE_PEEKDATA: {
- unsigned long tmp;
- int copied;
-
- copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
- ret = -EIO;
-
- if (copied != sizeof(tmp))
- break;
-
- ret = put_user(tmp,datap);
+ case PTRACE_PEEKDATA:
+ ret = generic_ptrace_peekdata(child, addr, data);
break;
break;
- }
/* Read the word at location address in the USER area. */
case PTRACE_PEEKUSR: {
/* Read the word at location address in the USER area. */
case PTRACE_PEEKUSR: {
@@
-114,12
+103,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
/* Write the word at location address. */
case PTRACE_POKETEXT:
case PTRACE_POKEDATA:
/* Write the word at location address. */
case PTRACE_POKETEXT:
case PTRACE_POKEDATA:
- ret = 0;
-
- if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
- break;
-
- ret = -EIO;
+ ret = generic_ptrace_pokedata(child, addr, data);
break;
/* Write the word at location address in the USER area. */
break;
/* Write the word at location address in the USER area. */
@@
-193,10
+177,6
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
ret = 0;
break;
ret = 0;
break;
- case PTRACE_DETACH:
- ret = ptrace_detach(child, data);
- break;
-
/* Get all GP registers from the child. */
case PTRACE_GETREGS: {
int i;
/* Get all GP registers from the child. */
case PTRACE_GETREGS: {
int i;