aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/power/process.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 9b5301c73b83..00cdbe5f518f 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -105,7 +105,7 @@ static void cancel_freezing(struct task_struct *p)
105 } 105 }
106} 106}
107 107
108static unsigned int try_to_freeze_tasks(int freeze_user_space) 108static int try_to_freeze_tasks(int freeze_user_space)
109{ 109{
110 struct task_struct *g, *p; 110 struct task_struct *g, *p;
111 unsigned long end_time; 111 unsigned long end_time;
@@ -176,28 +176,25 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space)
176 read_unlock(&tasklist_lock); 176 read_unlock(&tasklist_lock);
177 } 177 }
178 178
179 return todo; 179 return todo ? -EBUSY : 0;
180} 180}
181 181
182/** 182/**
183 * freeze_processes - tell processes to enter the refrigerator 183 * freeze_processes - tell processes to enter the refrigerator
184 *
185 * Returns 0 on success, or the number of processes that didn't freeze,
186 * although they were told to.
187 */ 184 */
188int freeze_processes(void) 185int freeze_processes(void)
189{ 186{
190 unsigned int nr_unfrozen; 187 int error;
191 188
192 printk("Stopping tasks ... "); 189 printk("Stopping tasks ... ");
193 nr_unfrozen = try_to_freeze_tasks(FREEZER_USER_SPACE); 190 error = try_to_freeze_tasks(FREEZER_USER_SPACE);
194 if (nr_unfrozen) 191 if (error)
195 return nr_unfrozen; 192 return error;
196 193
197 sys_sync(); 194 sys_sync();
198 nr_unfrozen = try_to_freeze_tasks(FREEZER_KERNEL_THREADS); 195 error = try_to_freeze_tasks(FREEZER_KERNEL_THREADS);
199 if (nr_unfrozen) 196 if (error)
200 return nr_unfrozen; 197 return error;
201 198
202 printk("done.\n"); 199 printk("done.\n");
203 BUG_ON(in_atomic()); 200 BUG_ON(in_atomic());