diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
| commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
| tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /kernel/signal.c | |
| parent | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (diff) | |
| parent | 2e885057b7f75035f0b85e02f737891482815a81 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index b3f78d09a105..206551563cce 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1994,8 +1994,6 @@ static bool do_signal_stop(int signr) | |||
| 1994 | */ | 1994 | */ |
| 1995 | if (!(sig->flags & SIGNAL_STOP_STOPPED)) | 1995 | if (!(sig->flags & SIGNAL_STOP_STOPPED)) |
| 1996 | sig->group_exit_code = signr; | 1996 | sig->group_exit_code = signr; |
| 1997 | else | ||
| 1998 | WARN_ON_ONCE(!current->ptrace); | ||
| 1999 | 1997 | ||
| 2000 | sig->group_stop_count = 0; | 1998 | sig->group_stop_count = 0; |
| 2001 | 1999 | ||