summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-12-06 20:34:34 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:28 -0800
commit3eb1b3a40722cbb46631db373af66d13d1e7ac81 (patch)
tree34b2d04387845a7074c5665269acc86b03812f0d /kernel
parent0d3a9abe8ae055e1052295698bcd0722c92eff47 (diff)
downloadop-kernel-dev-3eb1b3a40722cbb46631db373af66d13d1e7ac81.zip
op-kernel-dev-3eb1b3a40722cbb46631db373af66d13d1e7ac81.tar.gz
[PATCH] suspend to disk fails if gdb is suspended with a traced child
Fix http://bugzilla.kernel.org/show_bug.cgi?id=7534 Fix the freezing of processes so that it won't fail if there is a traced process the parent of which has been stopped. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: maurice barnum <pixi+kbug@burble.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/process.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index cba8a58..1badb9a 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -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;
}
OpenPOWER on IntegriCloud