summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorPavel Machek2006-03-23 12:00:02 +0100
committerLinus Torvalds2006-03-23 16:38:07 +0100
commit543cc27d09643640cbc34189c03a40beb8227aef (patch)
tree034b4141ed5ac76b220d55c738a0eda668c1a490 /kernel/power
parent[PATCH] kernel/power: move externs to header files (diff)
downloadkernel-qcow2-linux-543cc27d09643640cbc34189c03a40beb8227aef.tar.gz
kernel-qcow2-linux-543cc27d09643640cbc34189c03a40beb8227aef.tar.xz
kernel-qcow2-linux-543cc27d09643640cbc34189c03a40beb8227aef.zip
[PATCH] swsusp: documentation updates
Update suspend-to-RAM documentation with new machines, and makes message when processes can't be stopped little clearer. (In one case, waiting longer actually did help). From: "Rafael J. Wysocki" <rjw@sisk.pl> Warn in the documentation that data may be lost if there are some filesystems mounted from USB devices before suspend. [Thanks to Alan Stern for providing the answer to the question in the Q:-A: part.] Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 28de118f7a0b..02a1b3a9fa90 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -83,7 +83,7 @@ int freeze_processes(void)
yield(); /* Yield is okay here */
if (todo && time_after(jiffies, start_time + TIMEOUT)) {
printk( "\n" );
- printk(KERN_ERR " stopping tasks failed (%d tasks remaining)\n", todo );
+ printk(KERN_ERR " stopping tasks timed out (%d tasks remaining)\n", todo );
break;
}
} while(todo);