linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 72e72d2..67b2cdd 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -12,12 +12,11 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
-#include <linux/syscalls.h>
 
 /* 
  * Timeout for stopping processes
  */
-#define TIMEOUT        (20 * HZ)
+#define TIMEOUT        (6 * HZ)
 
 
 static inline int freezeable(struct task_struct * p)
@@ -54,78 +53,38 @@ void refrigerator(void)
        current->state = save;
 }
 
-static inline void freeze_process(struct task_struct *p)
-{
-       unsigned long flags;
-
-       if (!freezing(p)) {
-               freeze(p);
-               spin_lock_irqsave(&p->sighand->siglock, flags);
-               signal_wake_up(p, 0);
-               spin_unlock_irqrestore(&p->sighand->siglock, flags);
-       }
-}
-
-static void cancel_freezing(struct task_struct *p)
-{
-       unsigned long flags;
-
-       if (freezing(p)) {
-               pr_debug("  clean up: %s\n", p->comm);
-               do_not_freeze(p);
-               spin_lock_irqsave(&p->sighand->siglock, flags);
-               recalc_sigpending_tsk(p);
-               spin_unlock_irqrestore(&p->sighand->siglock, flags);
-       }
-}
-
 /* 0 = success, else # of processes that we failed to stop */
 int freeze_processes(void)
 {
-       int todo, nr_user, user_frozen;
+       int todo;
        unsigned long start_time;
        struct task_struct *g, *p;
+       unsigned long flags;
 
        printk( "Stopping tasks: " );
        start_time = jiffies;
-       user_frozen = 0;
        do {
-               nr_user = todo = 0;
+               todo = 0;
                read_lock(&tasklist_lock);
                do_each_thread(g, p) {
                        if (!freezeable(p))
                                continue;
                        if (frozen(p))
                                continue;
-                       if (p->state == TASK_TRACED && frozen(p->parent)) {
-                               cancel_freezing(p);
-                               continue;
-                       }
-                       if (p->mm && !(p->flags & PF_BORROWED_MM)) {
-                               /* The task is a user-space one.
-                                * Freeze it unless there's a vfork completion
-                                * pending
-                                */
-                               if (!p->vfork_done)
-                                       freeze_process(p);
-                               nr_user++;
-                       } else {
-                               /* Freeze only if the user space is frozen */
-                               if (user_frozen)
-                                       freeze_process(p);
-                               todo++;
-                       }
+
+                       freeze(p);
+                       spin_lock_irqsave(&p->sighand->siglock, flags);
+                       signal_wake_up(p, 0);
+                       spin_unlock_irqrestore(&p->sighand->siglock, flags);
+                       todo++;
                } while_each_thread(g, p);
                read_unlock(&tasklist_lock);
-               todo += nr_user;
-               if (!user_frozen && !nr_user) {
-                       sys_sync();
-                       start_time = jiffies;
-               }
-               user_frozen = !nr_user;
                yield();                        /* Yield is okay here */
-               if (todo && time_after(jiffies, start_time + TIMEOUT))
+               if (todo && time_after(jiffies, start_time + TIMEOUT)) {
+                       printk( "\n" );
+                       printk(KERN_ERR " stopping tasks failed (%d tasks remaining)\n", todo );
                        break;
+               }
        } while(todo);
 
        /* This does not unfreeze processes that are already frozen
@@ -134,16 +93,16 @@ int freeze_processes(void)
         * but it cleans up leftover PF_FREEZE requests.
         */
        if (todo) {
-               printk( "\n" );
-               printk(KERN_ERR " stopping tasks timed out "
-                       "after %d seconds (%d tasks remaining):\n",
-                       TIMEOUT / HZ, todo);
                read_lock(&tasklist_lock);
-               do_each_thread(g, p) {
-                       if (freezeable(p) && !frozen(p))
-                               printk(KERN_ERR "  %s\n", p->comm);
-                       cancel_freezing(p);
-               } while_each_thread(g, p);
+               do_each_thread(g, p)
+                       if (freezing(p)) {
+                               pr_debug("  clean up: %s\n", p->comm);
+                               p->flags &= ~PF_FREEZE;
+                               spin_lock_irqsave(&p->sighand->siglock, flags);
+                               recalc_sigpending_tsk(p);
+                               spin_unlock_irqrestore(&p->sighand->siglock, flags);
+                       }
+               while_each_thread(g, p);
                read_unlock(&tasklist_lock);
                return todo;
        }