aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/process.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index b0edfc6f2798..fedabad5a180 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -86,7 +86,7 @@ int freeze_processes(void)
86 unsigned long start_time; 86 unsigned long start_time;
87 struct task_struct *g, *p; 87 struct task_struct *g, *p;
88 88
89 printk( "Stopping tasks: " ); 89 printk("Stopping tasks... ");
90 start_time = jiffies; 90 start_time = jiffies;
91 user_frozen = 0; 91 user_frozen = 0;
92 do { 92 do {
@@ -134,21 +134,21 @@ int freeze_processes(void)
134 * but it cleans up leftover PF_FREEZE requests. 134 * but it cleans up leftover PF_FREEZE requests.
135 */ 135 */
136 if (todo) { 136 if (todo) {
137 printk( "\n" ); 137 printk("\n");
138 printk(KERN_ERR " stopping tasks timed out " 138 printk(KERN_ERR "Stopping tasks timed out "
139 "after %d seconds (%d tasks remaining):\n", 139 "after %d seconds (%d tasks remaining):\n",
140 TIMEOUT / HZ, todo); 140 TIMEOUT / HZ, todo);
141 read_lock(&tasklist_lock); 141 read_lock(&tasklist_lock);
142 do_each_thread(g, p) { 142 do_each_thread(g, p) {
143 if (freezeable(p) && !frozen(p)) 143 if (freezeable(p) && !frozen(p))
144 printk(KERN_ERR " %s\n", p->comm); 144 printk(KERN_ERR " %s\n", p->comm);
145 cancel_freezing(p); 145 cancel_freezing(p);
146 } while_each_thread(g, p); 146 } while_each_thread(g, p);
147 read_unlock(&tasklist_lock); 147 read_unlock(&tasklist_lock);
148 return todo; 148 return todo;
149 } 149 }
150 150
151 printk( "|\n" ); 151 printk("done.\n");
152 BUG_ON(in_atomic()); 152 BUG_ON(in_atomic());
153 return 0; 153 return 0;
154} 154}
@@ -157,18 +157,18 @@ void thaw_processes(void)
157{ 157{
158 struct task_struct *g, *p; 158 struct task_struct *g, *p;
159 159
160 printk( "Restarting tasks..." ); 160 printk("Restarting tasks... ");
161 read_lock(&tasklist_lock); 161 read_lock(&tasklist_lock);
162 do_each_thread(g, p) { 162 do_each_thread(g, p) {
163 if (!freezeable(p)) 163 if (!freezeable(p))
164 continue; 164 continue;
165 if (!thaw_process(p)) 165 if (!thaw_process(p))
166 printk(KERN_INFO " Strange, %s not stopped\n", p->comm ); 166 printk(KERN_INFO "Strange, %s not stopped\n", p->comm);
167 } while_each_thread(g, p); 167 } while_each_thread(g, p);
168 168
169 read_unlock(&tasklist_lock); 169 read_unlock(&tasklist_lock);
170 schedule(); 170 schedule();
171 printk( " done\n" ); 171 printk("done.\n");
172} 172}
173 173
174EXPORT_SYMBOL(refrigerator); 174EXPORT_SYMBOL(refrigerator);