hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM: convert printk to pr_* equivalent 

While touching this area let's convert printk to pr_*.  This also makes
the printing of continuation lines done properly.

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michal Hocko 2015-02-11 15:26:18 -08:00 committed by Linus Torvalds
parent 63a8ca9b20
commit 35536ae170
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/power/process.c
View File

@ -84,8 +84,8 @@ static int try_to_freeze_tasks(bool user_only)
elapsed_msecs = elapsed_msecs64; elapsed_msecs = elapsed_msecs64;
if (todo) { if (todo) {
printk("\n"); pr_cont("\n");
printk(KERN_ERR "Freezing of tasks %s after %d.%03d seconds " pr_err("Freezing of tasks %s after %d.%03d seconds "
"(%d tasks refusing to freeze, wq_busy=%d):\n", "(%d tasks refusing to freeze, wq_busy=%d):\n",
wakeup ? "aborted" : "failed", wakeup ? "aborted" : "failed",
elapsed_msecs / 1000, elapsed_msecs % 1000, elapsed_msecs / 1000, elapsed_msecs % 1000,
@ -101,7 +101,7 @@ static int try_to_freeze_tasks(bool user_only)
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
} }
} else { } else {
printk("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000, pr_cont("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000,
elapsed_msecs % 1000); elapsed_msecs % 1000);
} }
@ -155,7 +155,7 @@ int freeze_processes(void)
atomic_inc(&system_freezing_cnt); atomic_inc(&system_freezing_cnt);
pm_wakeup_clear(); pm_wakeup_clear();
printk("Freezing user space processes ... "); pr_info("Freezing user space processes ... ");
pm_freezing = true; pm_freezing = true;
oom_kills_saved = oom_kills_count(); oom_kills_saved = oom_kills_count();
error = try_to_freeze_tasks(true); error = try_to_freeze_tasks(true);
@ -171,13 +171,13 @@ int freeze_processes(void)
if (oom_kills_count() != oom_kills_saved && if (oom_kills_count() != oom_kills_saved &&
!check_frozen_processes()) { !check_frozen_processes()) {
__usermodehelper_set_disable_depth(UMH_ENABLED); __usermodehelper_set_disable_depth(UMH_ENABLED);
printk("OOM in progress."); pr_cont("OOM in progress.");
error = -EBUSY; error = -EBUSY;
} else { } else {
printk("done."); pr_cont("done.");
} }
} }
printk("\n"); pr_cont("\n");
BUG_ON(in_atomic()); BUG_ON(in_atomic());
if (error) if (error)
@ -197,13 +197,14 @@ int freeze_kernel_threads(void)
{ {
int error; int error;
printk("Freezing remaining freezable tasks ... "); pr_info("Freezing remaining freezable tasks ... ");
pm_nosig_freezing = true; pm_nosig_freezing = true;
error = try_to_freeze_tasks(false); error = try_to_freeze_tasks(false);
if (!error) if (!error)
printk("done."); pr_cont("done.");
printk("\n"); pr_cont("\n");
BUG_ON(in_atomic()); BUG_ON(in_atomic());
if (error) if (error)
@ -224,7 +225,7 @@ void thaw_processes(void)
oom_killer_enable(); oom_killer_enable();
printk("Restarting tasks ... "); pr_info("Restarting tasks ... ");
__usermodehelper_set_disable_depth(UMH_FREEZING); __usermodehelper_set_disable_depth(UMH_FREEZING);
thaw_workqueues(); thaw_workqueues();
@ -243,7 +244,7 @@ void thaw_processes(void)
usermodehelper_enable(); usermodehelper_enable();
schedule(); schedule();
printk("done.\n"); pr_cont("done.\n");
trace_suspend_resume(TPS("thaw_processes"), 0, false); trace_suspend_resume(TPS("thaw_processes"), 0, false);
} }
@ -252,7 +253,7 @@ void thaw_kernel_threads(void)
struct task_struct *g, *p; struct task_struct *g, *p;
pm_nosig_freezing = false; pm_nosig_freezing = false;
printk("Restarting kernel threads ... "); pr_info("Restarting kernel threads ... ");
thaw_workqueues(); thaw_workqueues();
@ -264,5 +265,5 @@ void thaw_kernel_threads(void)
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
schedule(); schedule();
printk("done.\n"); pr_cont("done.\n");
} }