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 thermal 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
6cbd34a
..
fd2129a
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>
@@
-37,7
+36,7
@@
inline long get_reg(struct task_struct *task, unsigned int regno)
if (regno == PT_USP)
return task->thread.usp;
else if (regno < PT_MAX)
if (regno == PT_USP)
return task->thread.usp;
else if (regno < PT_MAX)
- return ((unsigned long *)
user_regs(task->thread_info
))[regno];
+ return ((unsigned long *)
task_pt_regs(task
))[regno];
else
return 0;
}
else
return 0;
}
@@
-51,7
+50,7
@@
inline int put_reg(struct task_struct *task, unsigned int regno,
if (regno == PT_USP)
task->thread.usp = data;
else if (regno < PT_MAX)
if (regno == PT_USP)
task->thread.usp = data;
else if (regno < PT_MAX)
- ((unsigned long *)
user_regs(task->thread_info
))[regno] = data;
+ ((unsigned long *)
task_pt_regs(task
))[regno] = data;
else
return -1;
return 0;
else
return -1;
return 0;
@@
-202,18
+201,18
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
int i;
unsigned long tmp;
int i;
unsigned long tmp;
+ ret = 0;
for (i = 0; i <= PT_MAX; i++) {
tmp = get_reg(child, i);
if (put_user(tmp, datap)) {
ret = -EFAULT;
for (i = 0; i <= PT_MAX; i++) {
tmp = get_reg(child, i);
if (put_user(tmp, datap)) {
ret = -EFAULT;
-
goto out_ts
k;
+
brea
k;
}
data += sizeof(long);
}
}
data += sizeof(long);
}
- ret = 0;
break;
}
break;
}
@@
-222,10
+221,11
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
int i;
unsigned long tmp;
int i;
unsigned long tmp;
+ ret = 0;
for (i = 0; i <= PT_MAX; i++) {
if (get_user(tmp, datap)) {
ret = -EFAULT;
for (i = 0; i <= PT_MAX; i++) {
if (get_user(tmp, datap)) {
ret = -EFAULT;
-
goto out_ts
k;
+
brea
k;
}
if (i == PT_DCCR) {
}
if (i == PT_DCCR) {
@@
-237,7
+237,6
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
data += sizeof(long);
}
data += sizeof(long);
}
- ret = 0;
break;
}
break;
}