diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-12-06 10:16:24 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 10:16:24 -0500 |
commit | 66d0ae4d6ffa45b8e6d8bdbf85f8f1b285c8152d (patch) | |
tree | 3a0b33dd8c5c349ac4a48a177d8907c1ef3bd822 | |
parent | 8e60c6a1348e17e68ad73589a52a03876e7059be (diff) |
PM / Hibernate: Swap, use KERN_CONT
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>
-rw-r--r-- | kernel/power/swap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 0ce9b00f5d33..09b2b0ae9e9d 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
@@ -437,7 +437,7 @@ static int save_image(struct swap_map_handle *handle, | |||
437 | if (ret) | 437 | if (ret) |
438 | break; | 438 | break; |
439 | if (!(nr_pages % m)) | 439 | if (!(nr_pages % m)) |
440 | printk("\b\b\b\b%3d%%", nr_pages / m); | 440 | printk(KERN_CONT "\b\b\b\b%3d%%", nr_pages / m); |
441 | nr_pages++; | 441 | nr_pages++; |
442 | } | 442 | } |
443 | err2 = wait_on_bio_chain(&bio); | 443 | err2 = wait_on_bio_chain(&bio); |
@@ -445,9 +445,9 @@ static int save_image(struct swap_map_handle *handle, | |||
445 | if (!ret) | 445 | if (!ret) |
446 | ret = err2; | 446 | ret = err2; |
447 | if (!ret) | 447 | if (!ret) |
448 | printk("\b\b\b\bdone\n"); | 448 | printk(KERN_CONT "\b\b\b\bdone\n"); |
449 | else | 449 | else |
450 | printk("\n"); | 450 | printk(KERN_CONT "\n"); |
451 | swsusp_show_speed(&start, &stop, nr_to_write, "Wrote"); | 451 | swsusp_show_speed(&start, &stop, nr_to_write, "Wrote"); |
452 | return ret; | 452 | return ret; |
453 | } | 453 | } |