1 files changed, 17 insertions, 14 deletions

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index ef41440879ba..a0abf9a463f9 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -71,7 +71,8 @@ static int submit(int rw, pgoff_t page_off, struct page *page,
         bio->bi_end_io = end_swap_bio_read;
 
         if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
-                printk("swsusp: ERROR: adding page to bio at %ld\n", page_off);
+                printk(KERN_ERR "PM: Adding page to bio failed at %ld\n",
+                        page_off);
                 bio_put(bio);
                 return -EFAULT;
         }
@@ -151,7 +152,7 @@ static int mark_swapfiles(sector_t start, unsigned int flags)
                 error = bio_write_page(swsusp_resume_block,
                                         swsusp_header, NULL);
         } else {
-                printk(KERN_ERR "swsusp: Swap header not found!\n");
+                printk(KERN_ERR "PM: Swap header not found!\n");
                 error = -ENODEV;
         }
         return error;
@@ -323,7 +324,8 @@ static int save_image(struct swap_map_handle *handle,
         struct timeval start;
         struct timeval stop;
 
-        printk("Saving image data pages (%u pages) ...     ", nr_to_write);
+        printk(KERN_INFO "PM: Saving image data pages (%u pages) ...     ",
+                nr_to_write);
         m = nr_to_write / 100;
         if (!m)
                 m = 1;
@@ -363,7 +365,7 @@ static int enough_swap(unsigned int nr_pages)
 {
         unsigned int free_swap = count_swap_pages(root_swap, 1);
 
-        pr_debug("swsusp: free swap pages: %u\n", free_swap);
+        pr_debug("PM: Free swap pages: %u\n", free_swap);
         return free_swap > nr_pages + PAGES_FOR_IO;
 }
 
@@ -386,7 +388,7 @@ int swsusp_write(unsigned int flags)
 
         error = swsusp_swap_check();
         if (error) {
-                printk(KERN_ERR "swsusp: Cannot find swap device, try "
+                printk(KERN_ERR "PM: Cannot find swap device, try "
                                 "swapon -a.\n");
                 return error;
         }
@@ -400,7 +402,7 @@ int swsusp_write(unsigned int flags)
         }
         header = (struct swsusp_info *)data_of(snapshot);
         if (!enough_swap(header->pages)) {
-                printk(KERN_ERR "swsusp: Not enough free swap\n");
+                printk(KERN_ERR "PM: Not enough free swap\n");
                 error = -ENOSPC;
                 goto out;
         }
@@ -415,7 +417,7 @@ int swsusp_write(unsigned int flags)
 
                 if (!error) {
                         flush_swap_writer(&handle);
-                        printk("S");
+                        printk(KERN_INFO "PM: S");
                         error = mark_swapfiles(start, flags);
                         printk("|\n");
                 }
@@ -505,7 +507,8 @@ static int load_image(struct swap_map_handle *handle,
         int err2;
         unsigned nr_pages;
 
-        printk("Loading image data pages (%u pages) ...     ", nr_to_read);
+        printk(KERN_INFO "PM: Loading image data pages (%u pages) ...     ",
+                nr_to_read);
         m = nr_to_read / 100;
         if (!m)
                 m = 1;
@@ -556,7 +559,7 @@ int swsusp_read(unsigned int *flags_p)
 
         *flags_p = swsusp_header->flags;
         if (IS_ERR(resume_bdev)) {
-                pr_debug("swsusp: block device not initialised\n");
+                pr_debug("PM: Image device not initialised\n");
                 return PTR_ERR(resume_bdev);
         }
 
@@ -575,9 +578,9 @@ int swsusp_read(unsigned int *flags_p)
         blkdev_put(resume_bdev);
 
         if (!error)
-                pr_debug("swsusp: Reading resume file was successful\n");
+                pr_debug("PM: Image successfully loaded\n");
         else
-                pr_debug("swsusp: Error %d resuming\n", error);
+                pr_debug("PM: Error %d resuming\n", error);
         return error;
 }
 
@@ -609,13 +612,13 @@ int swsusp_check(void)
                 if (error)
                         blkdev_put(resume_bdev);
                 else
-                        pr_debug("swsusp: Signature found, resuming\n");
+                        pr_debug("PM: Signature found, resuming\n");
         } else {
                 error = PTR_ERR(resume_bdev);
         }
 
         if (error)
-                pr_debug("swsusp: Error %d check for resume file\n", error);
+                pr_debug("PM: Error %d checking image file\n", error);
 
         return error;
 }
@@ -627,7 +630,7 @@ int swsusp_check(void)
 void swsusp_close(void)
 {
         if (IS_ERR(resume_bdev)) {
-                pr_debug("swsusp: block device not initialised\n");
+                pr_debug("PM: Image device not initialised\n");
                 return;
         }