From f777ac9178e28811c3f611f43f684e4f5c4f73ad Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Fri, 12 Feb 2010 10:53:08 -0500
Subject: [PATCH] --- yaml --- r: 180533 b: refs/heads/master c:
 22a8cdd60339d931d0dca54427712b2714e5ba8b h: refs/heads/master i:   180531:
 8688383e1f16b895f513370369f10264b8b1ff3f v: v3

---
 [refs]                            | 2 +-
 trunk/arch/parisc/kernel/signal.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bfdb36737c0e..95cb3314ff6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e9695d9a45e9ea643f2f4e7f2859876940c58ae
+refs/heads/master: 22a8cdd60339d931d0dca54427712b2714e5ba8b
diff --git a/trunk/arch/parisc/kernel/signal.c b/trunk/arch/parisc/kernel/signal.c
index fb37ac52e46c..35c827e94e31 100644
--- a/trunk/arch/parisc/kernel/signal.c
+++ b/trunk/arch/parisc/kernel/signal.c
@@ -468,7 +468,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
 	recalc_sigpending();
 	spin_unlock_irq(&current->sighand->siglock);
 
-	tracehook_signal_handler(sig, info, ka, regs, 0);
+	tracehook_signal_handler(sig, info, ka, regs, 
+		test_thread_flag(TIF_SINGLESTEP) ||
+		test_thread_flag(TIF_BLOCKSTEP));
 
 	return 1;
 }