From 18e5ccfdc3a499b945df0961e9fddc2db06f2952 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 17 Sep 2012 18:42:01 -0400 Subject: [PATCH] --- yaml --- r: 333685 b: refs/heads/master c: 7f1c6168259f8d75c08f64aae3c8c93b2801eb37 h: refs/heads/master i: 333683: 1361cf3ccc9729bed1d7059255ccbe92cccf3ced v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/signal.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4143737cfc56..52963e815e37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 548916e9f59ba35174122e33c48ac744410973fa +refs/heads/master: 7f1c6168259f8d75c08f64aae3c8c93b2801eb37 diff --git a/trunk/arch/microblaze/kernel/signal.c b/trunk/arch/microblaze/kernel/signal.c index 76b9722557db..0d27fdbb30fd 100644 --- a/trunk/arch/microblaze/kernel/signal.c +++ b/trunk/arch/microblaze/kernel/signal.c @@ -254,10 +254,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, set_fs(USER_DS); - /* the tracer may want to single-step inside the handler */ - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - #ifdef DEBUG_SIG printk(KERN_INFO "SIG deliver (%s:%d): sp=%p pc=%08lx\n", current->comm, current->pid, frame, regs->pc); @@ -323,7 +319,8 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, if (ret) return; - signal_delivered(sig, info, ka, regs, 0); + signal_delivered(sig, info, ka, regs, + test_thread_flag(TIF_SINGLESTEP)); } /*