Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312044
b: refs/heads/master
c: a6b2029
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Jul 17, 2012
1 parent a22d156 commit 16c7c03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: f9717f3110c8d05ad65b9a91b698cc0612fd77af
refs/heads/master: a6b202979661eb32646048aeaad7be7b70c2cd22
7 changes: 3 additions & 4 deletions trunk/arch/m32r/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -591,17 +591,16 @@ void user_enable_single_step(struct task_struct *child)

if (access_process_vm(child, pc&~3, &insn, sizeof(insn), 0)
!= sizeof(insn))
return -EIO;
return;

compute_next_pc(insn, pc, &next_pc, child);
if (next_pc & 0x80000000)
return -EIO;
return;

if (embed_debug_trap(child, next_pc))
return -EIO;
return;

invalidate_cache();
return 0;
}

void user_disable_single_step(struct task_struct *child)
Expand Down

0 comments on commit 16c7c03

Please sign in to comment.