Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187242
b: refs/heads/master
c: 7a0fde8
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Hellwig authored and Linus Torvalds committed Mar 12, 2010
1 parent ddd4060 commit 92480d8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 57 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: 857fb252a1858ccded2e31ee98c6c0ab79c07999
refs/heads/master: 7a0fde8b3b16fcfb2bb4a136c53918f1ca9b35cc
56 changes: 0 additions & 56 deletions trunk/arch/m68knommu/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,62 +190,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
}
break;

case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
case PTRACE_CONT: { /* restart after signal. */
long tmp;

ret = -EIO;
if (!valid_signal(data))
break;
if (request == PTRACE_SYSCALL)
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
else
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
child->exit_code = data;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
wake_up_process(child);
ret = 0;
break;
}

/*
* make the child exit. Best I can do is send it a sigkill.
* perhaps it should be put in the status that it wants to
* exit.
*/
case PTRACE_KILL: {
long tmp;

ret = 0;
if (child->exit_state == EXIT_ZOMBIE) /* already dead */
break;
child->exit_code = SIGKILL;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
wake_up_process(child);
break;
}

case PTRACE_SINGLESTEP: { /* set the trap flag. */
long tmp;

ret = -EIO;
if (!valid_signal(data))
break;
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);

child->exit_code = data;
/* give it a chance to run. */
wake_up_process(child);
ret = 0;
break;
}

case PTRACE_GETREGS: { /* Get all gp regs from the child. */
int i;
unsigned long tmp;
Expand Down

0 comments on commit 92480d8

Please sign in to comment.