2 files changed, 9 insertions, 7 deletions

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 99eeb119b06d..b9a32860bef3 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -28,8 +28,7 @@ static inline int freezeable(struct task_struct * p)
         if ((p == current) || 
             (p->flags & PF_NOFREEZE) ||
             (p->exit_state == EXIT_ZOMBIE) ||
-            (p->exit_state == EXIT_DEAD) ||
-            (p->state == TASK_STOPPED))
+            (p->exit_state == EXIT_DEAD))
                 return 0;
         return 1;
 }
@@ -61,9 +60,12 @@ static inline void freeze_process(struct task_struct *p)
         unsigned long flags;
 
         if (!freezing(p)) {
+                if (p->state == TASK_STOPPED)
+                        force_sig_specific(SIGSTOP, p);
+
                 freeze(p);
                 spin_lock_irqsave(&p->sighand->siglock, flags);
-                signal_wake_up(p, 0);
+                signal_wake_up(p, p->state == TASK_STOPPED);
                 spin_unlock_irqrestore(&p->sighand->siglock, flags);
         }
 }
@@ -103,9 +105,7 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space)
                         if (frozen(p))
                                 continue;
 
-                        if (p->state == TASK_TRACED &&
-                            (frozen(p->parent) ||
-                             p->parent->state == TASK_STOPPED)) {
+                        if (p->state == TASK_TRACED && frozen(p->parent)) {
                                 cancel_freezing(p);
                                 continue;
                         }
diff --git a/kernel/signal.c b/kernel/signal.c
index 1921ffdc5e77..5630255d2e2a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1705,7 +1705,9 @@ finish_stop(int stop_count)
                 read_unlock(&tasklist_lock);
         }
 
-        schedule();
+        do {
+                schedule();
+        } while (try_to_freeze());
         /*
          * Now we don't run again until continued.
          */