aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/power/process.c')
-rw-r--r--kernel/power/process.c29
1 files changed, 9 insertions, 20 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 02e490e311eb..eefca8581fa0 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -120,22 +120,12 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space)
120 cancel_freezing(p); 120 cancel_freezing(p);
121 continue; 121 continue;
122 } 122 }
123 if (is_user_space(p)) { 123 if (is_user_space(p) == !freeze_user_space)
124 if (!freeze_user_space) 124 continue;
125 continue; 125
126 126 freeze_process(p);
127 /* Freeze the task unless there is a vfork 127 if (!freezer_should_skip(p))
128 * completion pending 128 todo++;
129 */
130 if (!p->vfork_done)
131 freeze_process(p);
132 } else {
133 if (freeze_user_space)
134 continue;
135
136 freeze_process(p);
137 }
138 todo++;
139 } while_each_thread(g, p); 129 } while_each_thread(g, p);
140 read_unlock(&tasklist_lock); 130 read_unlock(&tasklist_lock);
141 yield(); /* Yield is okay here */ 131 yield(); /* Yield is okay here */
@@ -161,7 +151,8 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space)
161 continue; 151 continue;
162 152
163 task_lock(p); 153 task_lock(p);
164 if (freezeable(p) && !frozen(p)) 154 if (freezeable(p) && !frozen(p) &&
155 !freezer_should_skip(p))
165 printk(KERN_ERR " %s\n", p->comm); 156 printk(KERN_ERR " %s\n", p->comm);
166 157
167 cancel_freezing(p); 158 cancel_freezing(p);
@@ -210,9 +201,7 @@ static void thaw_tasks(int thaw_user_space)
210 if (is_user_space(p) == !thaw_user_space) 201 if (is_user_space(p) == !thaw_user_space)
211 continue; 202 continue;
212 203
213 if (!thaw_process(p)) 204 thaw_process(p);
214 printk(KERN_WARNING " Strange, %s not stopped\n",
215 p->comm );
216 } while_each_thread(g, p); 205 } while_each_thread(g, p);
217 read_unlock(&tasklist_lock); 206 read_unlock(&tasklist_lock);
218} 207}