Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1adb469b authored by Jon Hunter's avatar Jon Hunter Committed by Rafael J. Wysocki
Browse files

PM / suspend: Fix missing KERN_CONT for suspend message 



Commit 4bcc595c (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: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 07d9a380

kernel/power/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -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