Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218543
b: refs/heads/master
c: aeebd3a
h: refs/heads/master
i:
  218541: 6e7e09c
  218539: eaa77c8
  218535: 9a5acaf
  218527: 7fc77a1
v: v3
  • Loading branch information
Namhyung Kim authored and Linus Torvalds committed Oct 28, 2010
1 parent 50c0f2e commit 018b209
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 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: 9f29b8fb416a0ad49d5077ab10ed780efdfcb126
refs/heads/master: aeebd3a3d9f5b67a254f04e6eac91a74c5e1065e
13 changes: 7 additions & 6 deletions trunk/arch/blackfin/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@
* Get contents of register REGNO in task TASK.
*/
static inline long
get_reg(struct task_struct *task, long regno, unsigned long __user *datap)
get_reg(struct task_struct *task, unsigned long regno,
unsigned long __user *datap)
{
long tmp;
struct pt_regs *regs = task_pt_regs(task);

if (regno & 3 || regno > PT_LAST_PSEUDO || regno < 0)
if (regno & 3 || regno > PT_LAST_PSEUDO)
return -EIO;

switch (regno) {
Expand Down Expand Up @@ -74,11 +75,11 @@ get_reg(struct task_struct *task, long regno, unsigned long __user *datap)
* Write contents of register REGNO in task TASK.
*/
static inline int
put_reg(struct task_struct *task, long regno, unsigned long data)
put_reg(struct task_struct *task, unsigned long regno, unsigned long data)
{
struct pt_regs *regs = task_pt_regs(task);

if (regno & 3 || regno > PT_LAST_PSEUDO || regno < 0)
if (regno & 3 || regno > PT_LAST_PSEUDO)
return -EIO;

switch (regno) {
Expand Down Expand Up @@ -369,14 +370,14 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_to_user(child, &user_bfin_native_view,
REGSET_GENERAL,
0, sizeof(struct pt_regs),
(void __user *)data);
datap);

case PTRACE_SETREGS:
pr_debug("ptrace: PTRACE_SETREGS\n");
return copy_regset_from_user(child, &user_bfin_native_view,
REGSET_GENERAL,
0, sizeof(struct pt_regs),
(const void __user *)data);
datap);

case_default:
default:
Expand Down

0 comments on commit 018b209

Please sign in to comment.