Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42726
b: refs/heads/master
c: 3eb1b3a
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Linus Torvalds committed Dec 7, 2006
1 parent e18f19c commit ae48d17
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d3a9abe8ae055e1052295698bcd0722c92eff47
refs/heads/master: 3eb1b3a40722cbb46631db373af66d13d1e7ac81
4 changes: 3 additions & 1 deletion trunk/kernel/power/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ int freeze_processes(void)
continue;
if (frozen(p))
continue;
if (p->state == TASK_TRACED && frozen(p->parent)) {
if (p->state == TASK_TRACED &&
(frozen(p->parent) ||
p->parent->state == TASK_STOPPED)) {
cancel_freezing(p);
continue;
}
Expand Down

0 comments on commit ae48d17

Please sign in to comment.