aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/swsusp.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-12-07 20:09:43 -0500
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:55 -0500
commit23976728a48c3b76d34e17ead19addd52b3a280e (patch)
tree964eb95ae9dccb179165649c7ea631d96b23bc91 /kernel/power/swsusp.c
parent465d2b477f6a0ffe01242561a93e7bf81d67c776 (diff)
Hibernation: Update messages
Make hibernation messages start with one common prefix "PM: " and use the word "hibernation" in the messages as a synonym of "suspend to disk". Turn some KERN_INFO messages into debug ones. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/swsusp.c')
-rw-r--r--kernel/power/swsusp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index dc29a20aff41..023ff2a31d89 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -188,7 +188,8 @@ void swsusp_show_speed(struct timeval *start, struct timeval *stop,
188 centisecs = 1; /* avoid div-by-zero */ 188 centisecs = 1; /* avoid div-by-zero */
189 k = nr_pages * (PAGE_SIZE / 1024); 189 k = nr_pages * (PAGE_SIZE / 1024);
190 kps = (k * 100) / centisecs; 190 kps = (k * 100) / centisecs;
191 printk("%s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\n", msg, k, 191 printk(KERN_INFO "PM: %s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\n",
192 msg, k,
192 centisecs / 100, centisecs % 100, 193 centisecs / 100, centisecs % 100,
193 kps / 1000, (kps % 1000) / 10); 194 kps / 1000, (kps % 1000) / 10);
194} 195}
@@ -219,7 +220,7 @@ int swsusp_shrink_memory(void)
219 char *p = "-\\|/"; 220 char *p = "-\\|/";
220 struct timeval start, stop; 221 struct timeval start, stop;
221 222
222 printk("Shrinking memory... "); 223 printk(KERN_INFO "PM: Shrinking memory... ");
223 do_gettimeofday(&start); 224 do_gettimeofday(&start);
224 do { 225 do {
225 long size, highmem_size; 226 long size, highmem_size;