PM / Hibernate: swap, use KERN_CONT
Subsystems (2)
PATCH 1/1 PM / Hibernate: swap, use KERN_CONT
Use KERN_CONT in save_image for printks. So that anybody won't try to add a loglevel.
--- kernel/power/swap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
kernel/power/swap.c +3 -3
@@ -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; }
Signature · 1 line
1.6.4.2
Quoted 2 lines · Jiri Slaby
Use
KERN_CONTinsave_imagefor 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
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 6 lines · Pavel Machek
Quoted 2 lines · Jiri Slaby
Use
KERN_CONTinsave_imagefor 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.
Rafael J. Wysocki
AppliedQuoted 4 lines · Jiri Slaby
Use
KERN_CONTinsave_imagefor printks. So that anybody won't try to add a loglevel.Signed-off-by Jiri Slaby <[email protected]>
Applied to suspend-2.6/linux-next.
Thanks,
Rafael
Quoted 30 lines
--- kernel/power/swap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)kernel/power/swap.c +3
-3@@ -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; }
Rafael J. Wysocki
AppliedQuoted 4 lines · Jiri Slaby
Use
KERN_CONTinsave_imagefor printks. So that anybody won't try to add a loglevel.Signed-off-by Jiri Slaby <[email protected]>
Applied to suspend-2.6/linux-next.
Thanks,
Rafael
Quoted 30 lines
--- kernel/power/swap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)kernel/power/swap.c +3
-3@@ -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; }