Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42721
b: refs/heads/master
c: 14b5b7c
h: refs/heads/master
i:
  42719: 9be5602
v: v3
  • Loading branch information
Nigel Cunningham authored and Linus Torvalds committed Dec 7, 2006
1 parent 5d0a12f commit 6bd35e0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 32d50f57dab94d8c46566a903bbb633ee72fdcc2
refs/heads/master: 14b5b7cfaa110b1d25b8f80b01a8c97cf2db30bc
16 changes: 8 additions & 8 deletions trunk/kernel/power/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand All @@ -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);

0 comments on commit 6bd35e0

Please sign in to comment.