From: Jiri Slaby <jirislaby@gmail.com>
Date: Sun, 6 Dec 2009 15:16:24 +0000 (+0100)
Subject: PM / Hibernate: Swap, use KERN_CONT
X-Git-Tag: v2.6.33-rc1~386^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=66d0ae4d6ffa45b8e6d8bdbf85f8f1b285c8152d;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 0ce9b00f5d3..09b2b0ae9e9 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -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;
 }