diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/process.c | 3 | ||||
-rw-r--r-- | kernel/signal.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index 8ac7c35fad77..b2a5f671d6cd 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c | |||
@@ -26,8 +26,7 @@ static inline int freezeable(struct task_struct * p) | |||
26 | (p->flags & PF_NOFREEZE) || | 26 | (p->flags & PF_NOFREEZE) || |
27 | (p->exit_state == EXIT_ZOMBIE) || | 27 | (p->exit_state == EXIT_ZOMBIE) || |
28 | (p->exit_state == EXIT_DEAD) || | 28 | (p->exit_state == EXIT_DEAD) || |
29 | (p->state == TASK_STOPPED) || | 29 | (p->state == TASK_STOPPED)) |
30 | (p->state == TASK_TRACED)) | ||
31 | return 0; | 30 | return 0; |
32 | return 1; | 31 | return 1; |
33 | } | 32 | } |
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 || |