PM / Hibernate: Swap, use KERN_CONT
authorJiri Slaby <jirislaby@gmail.com>
Sun, 6 Dec 2009 15:16:24 +0000 (16:16 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 6 Dec 2009 15:16:24 +0000 (16:16 +0100)
Use KERN_CONT in save_image() for printks, so that anybody won't
try to add a loglevel.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
kernel/power/swap.c

index 0ce9b00..09b2b0a 100644 (file)
@@ -437,7 +437,7 @@ static int save_image(struct swap_map_handle *handle,
                if (ret)
                        break;
                if (!(nr_pages % m))
-                       printk("\b\b\b\b%3d%%", nr_pages / m);
+                       printk(KERN_CONT "\b\b\b\b%3d%%", nr_pages / m);
                nr_pages++;
        }
        err2 = wait_on_bio_chain(&bio);
@@ -445,9 +445,9 @@ static int save_image(struct swap_map_handle *handle,
        if (!ret)
                ret = err2;
        if (!ret)
-               printk("\b\b\b\bdone\n");
+               printk(KERN_CONT "\b\b\b\bdone\n");
        else
-               printk("\n");
+               printk(KERN_CONT "\n");
        swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
        return ret;
 }