diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
| commit | 6e07e16404deafadf45895a7d2aeb5feba53b479 (patch) | |
| tree | a7025d6632f0b3eb6232eafba79f331ead812fcf /kernel/signal.c | |
| parent | 08a556db919f67e1e4d33ae8d40f7222da34d994 (diff) | |
| parent | e8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 4922928d91f6..92025b108791 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1560,6 +1560,7 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info) | |||
| 1560 | /* Let the debugger run. */ | 1560 | /* Let the debugger run. */ |
| 1561 | set_current_state(TASK_TRACED); | 1561 | set_current_state(TASK_TRACED); |
| 1562 | spin_unlock_irq(¤t->sighand->siglock); | 1562 | spin_unlock_irq(¤t->sighand->siglock); |
| 1563 | try_to_freeze(); | ||
| 1563 | read_lock(&tasklist_lock); | 1564 | read_lock(&tasklist_lock); |
| 1564 | if (likely(current->ptrace & PT_PTRACED) && | 1565 | if (likely(current->ptrace & PT_PTRACED) && |
| 1565 | likely(current->parent != current->real_parent || | 1566 | likely(current->parent != current->real_parent || |