---

yaml --- r: 179271 b: refs/heads/master c: 6f50248 h: refs/heads/master i: 179269: 5898dc1 179267: 3a1e5c7 179263: 189aa40 v: v3
git-mirror · Jan 13, 2010 · 49d9c6c · 49d9c6c
1 parent 6585360
commit 49d9c6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8d5faf718c9ff2c04eb8484585d4963c4111cd7
+refs/heads/master: 6f50248ef0efa7453397eb53e41e8aa5df534492
diff --git a/trunk/arch/s390/kernel/signal.c b/trunk/arch/s390/kernel/signal.c
@@ -499,19 +499,11 @@ void do_signal(struct pt_regs *regs)
 			if (test_thread_flag(TIF_RESTORE_SIGMASK))
 				clear_thread_flag(TIF_RESTORE_SIGMASK);
 
-			/*
-			 * If we would have taken a single-step trap
-			 * for a normal instruction, act like we took
-			 * one for the handler setup.
-			 */
-			if (current->thread.per_info.single_step)
-				set_thread_flag(TIF_SINGLE_STEP);
-
 			/*
 			 * Let tracing know that we've done the handler setup.
 			 */
 			tracehook_signal_handler(signr, &info, &ka, regs,
-					 test_thread_flag(TIF_SINGLE_STEP));
+					current->thread.per_info.single_step);
 		}
 		return;
 	}