2016-10-21 15:24:27

by Jon Hunter

Subject: [PATCH] PM / Suspend: Fix missing KERN_CONT for suspend message

Commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
continuation lines") exposed a missing KERN_CONT from one of the
messages shown on entering suspend. With v4.9-rc1, the 'done.' shown
after syncing the filesystems no longer appears as a continuation but
a new message with its own timestamp.

[ 9.259566] PM: Syncing filesystems ... [ 9.264119] done.

Fix this by adding the KERN_CONT log level for the 'done.' part of the
message seen after syncing filesystems. While we are at it, convert
these suspend printks to pr_info and pr_cont, respectively.

Signed-off-by: Jon Hunter <[email protected]>
---
kernel/power/suspend.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 1e7f5da648d9..6ccb08f57fcb 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -498,9 +498,9 @@ static int enter_state(suspend_state_t state)

#ifndef CONFIG_SUSPEND_SKIP_SYNC
trace_suspend_resume(TPS("sync_filesystems"), 0, true);
- printk(KERN_INFO "PM: Syncing filesystems ... ");
+ pr_info("PM: Syncing filesystems ... ");
sys_sync();
- printk("done.\n");
+ pr_cont("done.\n");
trace_suspend_resume(TPS("sync_filesystems"), 0, false);
#endif

--
1.9.1

2016-10-28 19:53:07

by Pavel Machek

Subject: Re: [PATCH] PM / Suspend: Fix missing KERN_CONT for suspend message

On Fri 2016-10-21 16:24:09, Jon Hunter wrote:
> Commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
> continuation lines") exposed a missing KERN_CONT from one of the
> messages shown on entering suspend. With v4.9-rc1, the 'done.' shown
> after syncing the filesystems no longer appears as a continuation but
> a new message with its own timestamp.
>
> [ 9.259566] PM: Syncing filesystems ... [ 9.264119] done.
>
> Fix this by adding the KERN_CONT log level for the 'done.' part of the
> message seen after syncing filesystems. While we are at it, convert
> these suspend printks to pr_info and pr_cont, respectively.
>
> Signed-off-by: Jon Hunter <[email protected]>

Acked-by: Pavel Machek <[email protected]>