Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 0a086640bcfc..3bd0d261818f 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -59,6 +59,7 @@ int freeze_processes(void)
         int todo;
         unsigned long start_time;
         struct task_struct *g, *p;
+        unsigned long flags;
 
         printk( "Stopping tasks: " );
         start_time = jiffies;
@@ -66,12 +67,9 @@ int freeze_processes(void)
                 todo = 0;
                 read_lock(&tasklist_lock);
                 do_each_thread(g, p) {
-                        unsigned long flags;
                         if (!freezeable(p))
                                 continue;
-                        if ((frozen(p)) ||
-                            (p->state == TASK_TRACED) ||
-                            (p->state == TASK_STOPPED))
+                        if (frozen(p))
                                 continue;
 
                         freeze(p);