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

From: Rafael J. Wysocki
Date: Wed Oct 28 2009 - 18:07:05 EST


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

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/