Skip to content

Commit

Permalink
tile: don't bother with SIGTRAP in setup_frame
Browse files Browse the repository at this point in the history
Tell signal_delivered() to do it instead.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Oct 1, 2012
1 parent 7f1c616 commit a925328
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
9 changes: 0 additions & 9 deletions arch/tile/kernel/compat_signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,6 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->regs[1] = ptr_to_compat_reg(&frame->info);
regs->regs[2] = ptr_to_compat_reg(&frame->uc);
regs->flags |= PT_FLAGS_CALLER_SAVES;

/*
* Notify any tracer that was single-stepping it.
* The tracer may want to single-step inside the
* handler too.
*/
if (test_thread_flag(TIF_SINGLESTEP))
ptrace_notify(SIGTRAP);

return 0;

give_sigsegv:
Expand Down
12 changes: 2 additions & 10 deletions arch/tile/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->regs[1] = (unsigned long) &frame->info;
regs->regs[2] = (unsigned long) &frame->uc;
regs->flags |= PT_FLAGS_CALLER_SAVES;

/*
* Notify any tracer that was single-stepping it.
* The tracer may want to single-step inside the
* handler too.
*/
if (test_thread_flag(TIF_SINGLESTEP))
ptrace_notify(SIGTRAP);

return 0;

give_sigsegv:
Expand Down Expand Up @@ -278,7 +269,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
ret = setup_rt_frame(sig, ka, info, oldset, regs);
if (ret)
return;
signal_delivered(sig, info, ka, regs, 0);
signal_delivered(sig, info, ka, regs,
test_thread_flag(TIF_SINGLESTEP));
}

/*
Expand Down

0 comments on commit a925328

Please sign in to comment.