Skip to content

Commit

Permalink
PM: convert printk to pr_* equivalent
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Hocko authored and Linus Torvalds committed Feb 12, 2015
1 parent 63a8ca9 commit 35536ae
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions kernel/power/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ static int try_to_freeze_tasks(bool user_only)
elapsed_msecs = elapsed_msecs64;

if (todo) {
printk("\n");
printk(KERN_ERR "Freezing of tasks %s after %d.%03d seconds "
pr_cont("\n");
pr_err("Freezing of tasks %s after %d.%03d seconds "
"(%d tasks refusing to freeze, wq_busy=%d):\n",
wakeup ? "aborted" : "failed",
elapsed_msecs / 1000, elapsed_msecs % 1000,
Expand All @@ -101,7 +101,7 @@ static int try_to_freeze_tasks(bool user_only)
read_unlock(&tasklist_lock);
}
} else {
printk("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000,
pr_cont("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000,
elapsed_msecs % 1000);
}

Expand Down Expand Up @@ -155,7 +155,7 @@ int freeze_processes(void)
atomic_inc(&system_freezing_cnt);

pm_wakeup_clear();
printk("Freezing user space processes ... ");
pr_info("Freezing user space processes ... ");
pm_freezing = true;
oom_kills_saved = oom_kills_count();
error = try_to_freeze_tasks(true);
Expand All @@ -171,13 +171,13 @@ int freeze_processes(void)
if (oom_kills_count() != oom_kills_saved &&
!check_frozen_processes()) {
__usermodehelper_set_disable_depth(UMH_ENABLED);
printk("OOM in progress.");
pr_cont("OOM in progress.");
error = -EBUSY;
} else {
printk("done.");
pr_cont("done.");
}
}
printk("\n");
pr_cont("\n");
BUG_ON(in_atomic());

if (error)
Expand All @@ -197,13 +197,14 @@ int freeze_kernel_threads(void)
{
int error;

printk("Freezing remaining freezable tasks ... ");
pr_info("Freezing remaining freezable tasks ... ");

pm_nosig_freezing = true;
error = try_to_freeze_tasks(false);
if (!error)
printk("done.");
pr_cont("done.");

printk("\n");
pr_cont("\n");
BUG_ON(in_atomic());

if (error)
Expand All @@ -224,7 +225,7 @@ void thaw_processes(void)

oom_killer_enable();

printk("Restarting tasks ... ");
pr_info("Restarting tasks ... ");

__usermodehelper_set_disable_depth(UMH_FREEZING);
thaw_workqueues();
Expand All @@ -243,7 +244,7 @@ void thaw_processes(void)
usermodehelper_enable();

schedule();
printk("done.\n");
pr_cont("done.\n");
trace_suspend_resume(TPS("thaw_processes"), 0, false);
}

Expand All @@ -252,7 +253,7 @@ void thaw_kernel_threads(void)
struct task_struct *g, *p;

pm_nosig_freezing = false;
printk("Restarting kernel threads ... ");
pr_info("Restarting kernel threads ... ");

thaw_workqueues();

Expand All @@ -264,5 +265,5 @@ void thaw_kernel_threads(void)
read_unlock(&tasklist_lock);

schedule();
printk("done.\n");
pr_cont("done.\n");
}

0 comments on commit 35536ae

Please sign in to comment.