From 6bd35e02b5837ab2de931339846fbd265cb3312a Mon Sep 17 00:00:00 2001 From: Nigel Cunningham Date: Wed, 6 Dec 2006 20:34:26 -0800 Subject: [PATCH] --- yaml --- r: 42721 b: refs/heads/master c: 14b5b7cfaa110b1d25b8f80b01a8c97cf2db30bc h: refs/heads/master i: 42719: 9be560239be91327f4ab80245d491e34ca6df8a3 v: v3 --- [refs] | 2 +- trunk/kernel/power/process.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a90a483e2e27..b3a1068249e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32d50f57dab94d8c46566a903bbb633ee72fdcc2 +refs/heads/master: 14b5b7cfaa110b1d25b8f80b01a8c97cf2db30bc diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c index b0edfc6f2798..fedabad5a180 100644 --- a/trunk/kernel/power/process.c +++ b/trunk/kernel/power/process.c @@ -86,7 +86,7 @@ int freeze_processes(void) unsigned long start_time; struct task_struct *g, *p; - printk( "Stopping tasks: " ); + printk("Stopping tasks... "); start_time = jiffies; user_frozen = 0; do { @@ -134,21 +134,21 @@ int freeze_processes(void) * but it cleans up leftover PF_FREEZE requests. */ if (todo) { - printk( "\n" ); - printk(KERN_ERR " stopping tasks timed out " + printk("\n"); + printk(KERN_ERR "Stopping tasks timed out " "after %d seconds (%d tasks remaining):\n", TIMEOUT / HZ, todo); read_lock(&tasklist_lock); do_each_thread(g, p) { if (freezeable(p) && !frozen(p)) - printk(KERN_ERR " %s\n", p->comm); + printk(KERN_ERR " %s\n", p->comm); cancel_freezing(p); } while_each_thread(g, p); read_unlock(&tasklist_lock); return todo; } - printk( "|\n" ); + printk("done.\n"); BUG_ON(in_atomic()); return 0; } @@ -157,18 +157,18 @@ void thaw_processes(void) { struct task_struct *g, *p; - printk( "Restarting tasks..." ); + printk("Restarting tasks... "); read_lock(&tasklist_lock); do_each_thread(g, p) { if (!freezeable(p)) continue; if (!thaw_process(p)) - printk(KERN_INFO " Strange, %s not stopped\n", p->comm ); + printk(KERN_INFO "Strange, %s not stopped\n", p->comm); } while_each_thread(g, p); read_unlock(&tasklist_lock); schedule(); - printk( " done\n" ); + printk("done.\n"); } EXPORT_SYMBOL(refrigerator);