[PATCH 1/1] PM / Hibernate: swap, use KERN_CONT

[PATCH 1/1] PM / Hibernate: swap, use KERN_CONT

[Jiri Slaby]

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>
---
 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 47586d9..4c0f80b 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;
 }
-- 
1.6.4.2

Re: [PATCH 1/1] PM / Hibernate: swap, use KERN_CONT

[Pavel Machek]

On Sat 2009-10-10 14:00:24, Jiri Slaby wrote:
> Use KERN_CONT in save_image for printks. So that anybody won't
> try to add a loglevel.

Someone has a big, pending patch to switch to pr_*. Should we take
that instead?
								Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 1/1] PM / Hibernate: swap, use KERN_CONT

[Jiri Slaby]

On 10/10/2009 02:15 PM, Pavel Machek wrote:
> On Sat 2009-10-10 14:00:24, Jiri Slaby wrote:
>> Use KERN_CONT in save_image for printks. So that anybody won't
>> try to add a loglevel.
> 
> Someone has a big, pending patch to switch to pr_*. Should we take
> that instead?

I have no problem with that at all.

Re: [PATCH 1/1] PM / Hibernate: swap, use KERN_CONT

[Rafael J. Wysocki]

On Saturday 10 October 2009, Jiri Slaby wrote:
> 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>

Applied to suspend-2.6/linux-next.

Thanks,
Rafael


> ---
>  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 47586d9..4c0f80b 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;
>  }
>