summaryrefslogtreecommitdiffstats
path: root/kernel/power/swap.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-09-28 23:31:22 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2010-10-17 01:57:48 +0200
commitd0941ead3fdd31aafff992d211bcefdbff1eaedb (patch)
tree3afd75a241739a7b3188a8e8ead167c10aeaac46 /kernel/power/swap.c
parentPM / Runtime: Implement autosuspend support (diff)
downloadlinux-d0941ead3fdd31aafff992d211bcefdbff1eaedb.tar.xz
linux-d0941ead3fdd31aafff992d211bcefdbff1eaedb.zip
PM / Hibernate: Make some boot messages look less scary
The hibernate resume code checks if there is an image to resume from on every boot and, if the kernel is built with CONFIG_PM_DEBUG set and the image is not present, it prints some scary messages suggesting there was a boot error of some sort. Apparently, some users are confused by them, so make them look less scary and adjust the other hibernate resume debug messages to match them. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/swap.c')
-rw-r--r--kernel/power/swap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 3dc0552cddfb..2dfa87869b49 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -929,13 +929,13 @@ put:
if (error)
blkdev_put(hib_resume_bdev, FMODE_READ);
else
- pr_debug("PM: Signature found, resuming\n");
+ pr_debug("PM: Image signature found, resuming\n");
} else {
error = PTR_ERR(hib_resume_bdev);
}
if (error)
- pr_debug("PM: Error %d checking image file\n", error);
+ pr_debug("PM: Image not found (code %d)\n", error);
return error;
}