revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index cdac5f955b857e5707ef2050667cf6975b01032d..028a99598f4986b6dfcfaf946af51952f071c346 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -16,7 +16,6 @@
 #include <linux/freezer.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
-#include <linux/wakelock.h>
 
 /* 
  * Timeout for stopping processes
@@ -41,7 +40,6 @@ static int try_to_freeze_tasks(bool sig_only)
        struct timeval start, end;
        u64 elapsed_csecs64;
        unsigned int elapsed_csecs;
-       unsigned int wakeup = 0;
 
        do_gettimeofday(&start);
 
@@ -77,10 +75,6 @@ static int try_to_freeze_tasks(bool sig_only)
                        todo += wq_busy;
                }
 
-               if (todo && has_wake_lock(WAKE_LOCK_SUSPEND)) {
-                       wakeup = 1;
-                       break;
-               }
                if (!todo || time_after(jiffies, end_time))
                        break;
 
@@ -102,25 +96,18 @@ static int try_to_freeze_tasks(bool sig_only)
                 * and caller must call thaw_processes() if something fails),
                 * but it cleans up leftover PF_FREEZE requests.
                 */
-               if(wakeup) {
-                       printk("\n");
-                       printk(KERN_ERR "Freezing of %s aborted\n",
-                                       sig_only ? "user space " : "tasks ");
-               }
-               else {
-                       printk("\n");
-                       printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
-                              "(%d tasks refusing to freeze, wq_busy=%d):\n",
-                              elapsed_csecs / 100, elapsed_csecs % 100,
-                              todo - wq_busy, wq_busy);
-               }
+               printk("\n");
+               printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
+                      "(%d tasks refusing to freeze, wq_busy=%d):\n",
+                      elapsed_csecs / 100, elapsed_csecs % 100,
+                      todo - wq_busy, wq_busy);
+
                thaw_workqueues();
 
                read_lock(&tasklist_lock);
                do_each_thread(g, p) {
                        task_lock(p);
-                       if (freezing(p) && !freezer_should_skip(p) &&
-                               elapsed_csecs > 100)
+                       if (freezing(p) && !freezer_should_skip(p))
                                sched_show_task(p);
                        cancel_freezing(p);
                        task_unlock(p);