summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJon Hunter <jonathanh@nvidia.com>2016-10-21 16:24:09 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-24 14:38:02 +0200
commit1adb469b9b76276d7e5ea36a20a24c47d6618a0b (patch)
tree307baf26669159c6967b2a4e6b2b855b2175bdb1 /kernel
parent07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff)
downloadlinux-stable-1adb469b9b76276d7e5ea36a20a24c47d6618a0b.tar.gz
linux-stable-1adb469b9b76276d7e5ea36a20a24c47d6618a0b.tar.bz2
linux-stable-1adb469b9b76276d7e5ea36a20a24c47d6618a0b.zip
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 <jonathanh@nvidia.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/suspend.c4
1 files 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